Don't escape phpVars

adaur · adaur · commit 223fd1cba298 · 2017-02-28T19:22:43.000+01:00
diff --git a/featherbb/Core/Interfaces/Lang.php b/featherbb/Core/Interfaces/Lang.php
@@ -20,7 +20,7 @@ public static function construct($domain = 'FeatherBB')
     public static function load($file, $domain = 'FeatherBB', $path = false, $language = false)
     {
         // Set default path to forum core translations
-        $path = $path ? $path :  ForumEnv::get('FEATHER_ROOT').'featherbb/lang';
+        $path = $path ? $path : ForumEnv::get('FEATHER_ROOT').'featherbb/lang';
         // Set default language to current user
         if (!$language) {
             $language = (!User::get(null)) ? 'English' : User::getPref('language');
diff --git a/featherbb/View/layout.html.twig b/featherbb/View/layout.html.twig
@@ -321,16 +321,16 @@
 {% endif %}
 </section>
 
+<!-- JSRAW -->
+<script>
+    var baseUrl = '{{ urlBase() }}',
+        phpVars = {{ jsVars|json_encode()|raw }};
+    {{ jsraw|raw }}
+</script>
 <!-- JS -->
 {% for script in assets.js %}
 <script {% for key, value in script.params %}{{ key }}="{{ value }}"{% endfor %} src="{{ urlBase() }}/{{ script.file }}" /></script>
 {% endfor %}
-<!-- JSRAW -->
-<script>
-var baseUrl = '{{ urlBase() }}',
-    phpVars = {{ jsVars|json_encode() }};
-{{ jsraw|raw }}
-</script>
 {{ fireHook('view.footer.before.html.tag') }}
 </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static function construct($domain = 'FeatherBB')`
`20`	`20`	`public static function load($file, $domain = 'FeatherBB', $path = false, $language = false)`
`21`	`21`	`{`
`22`	`22`	`// Set default path to forum core translations`
`23`		`- $path = $path ? $path : ForumEnv::get('FEATHER_ROOT').'featherbb/lang';`
	`23`	`+ $path = $path ? $path : ForumEnv::get('FEATHER_ROOT').'featherbb/lang';`
`24`	`24`	`// Set default language to current user`
`25`	`25`	`if (!$language) {`
`26`	`26`	`$language = (!User::get(null)) ? 'English' : User::getPref('language');`