From: Matthias Schmidt <gravatronics@live.com>
Date: Thu, 18 Aug 2016 17:09:26 +0000 (+0200)
Subject: Do not use `$__language` as template variable for iterations
X-Git-Tag: 3.0.0_Beta_1~685
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fb062f13339de073b3b7d004f62c00138923efca;p=GitHub%2FWoltLab%2FWCF.git

Do not use `$__language` as template variable for iterations

It is already internally used and thus can cause conflicts.
---

diff --git a/com.woltlab.wcf/templates/languageChooser.tpl b/com.woltlab.wcf/templates/languageChooser.tpl
index 61b78e6b23..cc72886b5b 100644
--- a/com.woltlab.wcf/templates/languageChooser.tpl
+++ b/com.woltlab.wcf/templates/languageChooser.tpl
@@ -7,8 +7,8 @@
 		<dd id="{@$__languageChooserPrefix}languageIDContainer">
 			<noscript>
 				<select name="languageID" id="languageID">
-					{foreach from=$languages item=__language}
-						<option value="{@$__language->languageID}">{$__language}</option>
+					{foreach from=$languages item=_language}
+						<option value="{@$_language->languageID}">{$_language}</option>
 					{/foreach}
 				</select>
 			</noscript>
@@ -18,10 +18,10 @@
 	<script data-relocate="true">
 		require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) {
 			var languages = {
-				{implode from=$languages item=__language}
-					'{@$__language->languageID}': {
-						iconPath: '{@$__language->getIconPath()|encodeJS}',
-						languageName: '{@$__language|encodeJS}'
+				{implode from=$languages item=_language}
+					'{@$_language->languageID}': {
+						iconPath: '{@$_language->getIconPath()|encodeJS}',
+						languageName: '{@$_language|encodeJS}'
 					}
 				{/implode}
 			};
diff --git a/com.woltlab.wcf/templates/messageFormMultilingualism.tpl b/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
index c237efaab3..e9d6d22b82 100644
--- a/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
+++ b/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
@@ -15,10 +15,10 @@
 	<script data-relocate="true">
 		require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) {
 			var languages = {
-				{implode from=$availableContentLanguages item=__language}
-					'{@$__language->languageID}': {
-						iconPath: '{@$__language->getIconPath()|encodeJS}',
-						languageName: '{@$__language|encodeJS}'
+				{implode from=$availableContentLanguages item=_language}
+					'{@$_language->languageID}': {
+						iconPath: '{@$_language->getIconPath()|encodeJS}',
+						languageName: '{@$_language|encodeJS}'
 					}
 				{/implode}
 			};
diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index 41a1b3abf7..b56592d6cf 100644
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -103,11 +103,11 @@
 					<script data-relocate="true">
 						require(['EventHandler', 'WoltLabSuite/Core/Language/Chooser'], function(EventHandler, LanguageChooser) {
 							var languages = {
-								{implode from=$__wcf->getLanguage()->getLanguages() item=__language}
-									'{@$__language->languageID}': {
-										iconPath: '{@$__language->getIconPath()|encodeJS}',
-										languageName: '{@$__language|encodeJS}',
-										languageCode: '{@$__language->languageCode|encodeJS}'
+								{implode from=$__wcf->getLanguage()->getLanguages() item=_language}
+									'{@$_language->languageID}': {
+										iconPath: '{@$_language->getIconPath()|encodeJS}',
+										languageName: '{@$_language|encodeJS}',
+										languageCode: '{@$_language->languageCode|encodeJS}'
 									}
 								{/implode}
 							};
diff --git a/com.woltlab.wcf/templates/pageMenuMobile.tpl b/com.woltlab.wcf/templates/pageMenuMobile.tpl
index 0549637505..33f82d5d53 100644
--- a/com.woltlab.wcf/templates/pageMenuMobile.tpl
+++ b/com.woltlab.wcf/templates/pageMenuMobile.tpl
@@ -146,11 +146,11 @@
 						<span class="menuOverlayItemTitle">{$__wcf->getLanguage()}</span>
 					</a>
 					<ol class="menuOverlayItemList" data-title="{lang}wcf.user.language{/lang}">
-						{foreach from=$__wcf->getLanguage()->getLanguages() item=__language}
-							<li class="menuOverlayItem" data-more="com.woltlab.wcf.language" data-language-id="{@$__language->languageID}">
+						{foreach from=$__wcf->getLanguage()->getLanguages() item=_language}
+							<li class="menuOverlayItem" data-more="com.woltlab.wcf.language" data-language-id="{@$_language->languageID}">
 								<a href="#" class="menuOverlayItemLink box24">
-									<img src="{$__language->getIconPath()}" alt="">
-									<span class="menuOverlayItemTitle">{$__language}</span>
+									<img src="{$_language->getIconPath()}" alt="">
+									<span class="menuOverlayItemTitle">{$_language}</span>
 								</a>
 							</li>
 						{/foreach}
diff --git a/wcfsetup/install/files/acp/templates/languageChooser.tpl b/wcfsetup/install/files/acp/templates/languageChooser.tpl
index 61b78e6b23..cc72886b5b 100644
--- a/wcfsetup/install/files/acp/templates/languageChooser.tpl
+++ b/wcfsetup/install/files/acp/templates/languageChooser.tpl
@@ -7,8 +7,8 @@
 		<dd id="{@$__languageChooserPrefix}languageIDContainer">
 			<noscript>
 				<select name="languageID" id="languageID">
-					{foreach from=$languages item=__language}
-						<option value="{@$__language->languageID}">{$__language}</option>
+					{foreach from=$languages item=_language}
+						<option value="{@$_language->languageID}">{$_language}</option>
 					{/foreach}
 				</select>
 			</noscript>
@@ -18,10 +18,10 @@
 	<script data-relocate="true">
 		require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) {
 			var languages = {
-				{implode from=$languages item=__language}
-					'{@$__language->languageID}': {
-						iconPath: '{@$__language->getIconPath()|encodeJS}',
-						languageName: '{@$__language|encodeJS}'
+				{implode from=$languages item=_language}
+					'{@$_language->languageID}': {
+						iconPath: '{@$_language->getIconPath()|encodeJS}',
+						languageName: '{@$_language|encodeJS}'
 					}
 				{/implode}
 			};