Change: use json_encode in jsArrayByMask for better escaping

ezsystems · Oct 21, 2010 · 46f28fe · 46f28fe
1 parent f9169f2
commit 46f28fe
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/kernel/classes/ezcontentlanguage.php b/kernel/classes/ezcontentlanguage.php
@@ -898,17 +898,17 @@ static function clearCronjobMode()
      */
     static function jsArrayByMask( $mask )
     {
-        $jsArray = array();
+        $localList = array();
         $languages = eZContentLanguage::prioritizedLanguagesByMask( $mask );
         foreach ( $languages as $key => $language )
         {
-            $jsArray[] = "{ locale: '".$language->attribute( 'locale' ).
-                "', name: '".$language->attribute( 'name' )."' }";
+            $localList[] = array( 'locale' => $language->attribute( 'locale' ),
+                                  'name'   => $language->attribute( 'name' ) );
         }
 
-        if ( $jsArray )
+        if ( $localList )
         {
-            return '[ '.implode( ', ', $jsArray ).' ]';
+            return json_encode( $localList );
         }
         else
         {