From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 26 May 2016 12:54:17 +0000 (+0200)
Subject: Fixed encoding issue in language chooser
X-Git-Tag: 3.0.0_Beta_1~1625
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3664a4c449b5ad9d395d11a1022b2103c6067b36;p=GitHub%2FWoltLab%2FWCF.git

Fixed encoding issue in language chooser
---

diff --git a/com.woltlab.wcf/templates/languageChooser.tpl b/com.woltlab.wcf/templates/languageChooser.tpl
index b22a59d60b..b3fb0a854d 100644
--- a/com.woltlab.wcf/templates/languageChooser.tpl
+++ b/com.woltlab.wcf/templates/languageChooser.tpl
@@ -20,7 +20,7 @@
 				{implode from=$languages item=__language}
 					'{@$__language->languageID}': {
 						iconPath: '{@$__language->getIconPath()|encodeJS}',
-						languageName: '{$__language}'
+						languageName: '{@$__language|encodeJS}'
 					}
 				{/implode}
 			};
diff --git a/com.woltlab.wcf/templates/messageFormMultilingualism.tpl b/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
index 353f09ff65..61adf5b845 100644
--- a/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
+++ b/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
@@ -18,7 +18,7 @@
 				{implode from=$availableContentLanguages item=__language}
 					'{@$__language->languageID}': {
 						iconPath: '{@$__language->getIconPath()|encodeJS}',
-						languageName: '{$__language}'
+						languageName: '{@$__language|encodeJS}'
 					}
 				{/implode}
 			};
diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index 612a6900a2..611f94473a 100644
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -106,7 +106,7 @@
 								{implode from=$__wcf->getLanguage()->getLanguages() item=__language}
 									'{@$__language->languageID}': {
 										iconPath: '{@$__language->getIconPath()|encodeJS}',
-										languageName: '{$__language}'
+										languageName: '{@$__language|encodeJS}'
 									}
 								{/implode}
 							};
diff --git a/com.woltlab.wcf/templates/settings.tpl b/com.woltlab.wcf/templates/settings.tpl
index 220f59fc90..62244f06bc 100644
--- a/com.woltlab.wcf/templates/settings.tpl
+++ b/com.woltlab.wcf/templates/settings.tpl
@@ -27,8 +27,8 @@
 								var $languages = {
 									{implode from=$availableLanguages item=language}
 										'{@$language->languageID}': {
-											iconPath: '{@$language->getIconPath()}',
-											languageName: '{$language}'
+											iconPath: '{@$language->getIconPath()|encodeJS}',
+											languageName: '{@$language|encodeJS}'
 										}
 									{/implode}
 								};
diff --git a/wcfsetup/install/files/acp/templates/languageChooser.tpl b/wcfsetup/install/files/acp/templates/languageChooser.tpl
index b22a59d60b..b3fb0a854d 100644
--- a/wcfsetup/install/files/acp/templates/languageChooser.tpl
+++ b/wcfsetup/install/files/acp/templates/languageChooser.tpl
@@ -20,7 +20,7 @@
 				{implode from=$languages item=__language}
 					'{@$__language->languageID}': {
 						iconPath: '{@$__language->getIconPath()|encodeJS}',
-						languageName: '{$__language}'
+						languageName: '{@$__language|encodeJS}'
 					}
 				{/implode}
 			};