Fixed encoding issue in language chooser

diff --git a/com.woltlab.wcf/templates/languageChooser.tpl b/com.woltlab.wcf/templates/languageChooser.tpl
index b22a59d60ba31d44bd9b774a0f0535a9cda847f3..b3fb0a854d6ec2f19492380656382ea3bac4099c 100644 (file)
--- 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 353f09ff659de13ff2bb8056301b390c90ba9bd8..61adf5b8453ffc233a23b85bfcb05d0e5cd8f750 100644 (file)
--- 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 612a6900a219aff07f85a572cc1e3d119d2385f9..611f94473a2ce7e037abd693252c6dc71422dcfd 100644 (file)
--- 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 220f59fc90bd6a4a4e3dc517c2b181986d0b26fe..62244f06bc648a5ff40c5f789527d6d46642e057 100644 (file)
--- 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 b22a59d60ba31d44bd9b774a0f0535a9cda847f3..b3fb0a854d6ec2f19492380656382ea3bac4099c 100644 (file)
--- 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}
                        };