From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 15 Aug 2014 11:54:33 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~444
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=efd28ffb4e89196d095b3bb4fcd8d219760a7144;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'
---

efd28ffb4e89196d095b3bb4fcd8d219760a7144
diff --cc com.woltlab.wcf/templates/moderationReport.tpl
index bdb16a53d6,beafea37e8..839c291a3c
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@@ -9,17 -10,12 +9,17 @@@
  		//<![CDATA[
  		$(function() {
  			WCF.Language.addObject({
 +				'wcf.moderation.assignedUser': '{lang}wcf.moderation.assignedUser{/lang}',
 +				'wcf.moderation.assignedUser.change': '{lang}wcf.moderation.assignedUser.change{/lang}',
 +				'wcf.moderation.assignedUser.error.notAffected': '{lang}wcf.moderation.assignedUser.error.notAffected{/lang}',
  				'wcf.moderation.report.removeContent.confirmMessage': '{lang}wcf.moderation.report.removeContent.confirmMessage{/lang}',
  				'wcf.moderation.report.removeContent.reason': '{lang}wcf.moderation.report.removeContent.reason{/lang}',
 -				'wcf.moderation.report.removeReport.confirmMessage': '{lang}wcf.moderation.report.removeReport.confirmMessage{/lang}'
 +				'wcf.moderation.report.removeReport.confirmMessage': '{lang}wcf.moderation.report.removeReport.confirmMessage{/lang}',
 +				'wcf.moderation.status.outstanding': '{lang}wcf.moderation.status.outstanding{/lang}',
 +				'wcf.moderation.status.processing': '{lang}wcf.moderation.status.processing{/lang}'
  			});
  			
- 			new WCF.Moderation.Report.Management({@$queue->queueID}, '{link controller='ModerationList'}{/link}');
+ 			new WCF.Moderation.Report.Management({@$queue->queueID}, '{link controller='ModerationList' encode=false}{/link}');
  		});
  		//]]>
  	</script>