Changeset 18813

Timestamp:

09/29/2011 06:43:46 AM (13 years ago)

Author:

azaozz

Message:

Recursively convert html entities in script localization strings, see #11520

File:

• trunk/wp-includes/class.wp-scripts.php (modified) (3 diffs)

trunk/wp-includes/class.wp-scripts.php

@@ -63 +63 @@
                 unset($data['l10n_print_after']);
             }
-            $output = "var $name = " . json_encode($data) . "; $after\n";
+
+            $data = $this->decode_html_entities($data);
+            $output = "var $name = " . json_encode( $data ) . "; $after\n";
         } else {
             $data = $this->get_data( $handle, 'data' );
@@ -70 +72 @@
                 return false;
 
-            foreach ( (array) $data as $name => $data ) {
-                $output = "var $name = " . json_encode($data) . ";\n";
+            foreach ( (array) $data as $name => $value ) {
+                $value = $this->decode_html_entities($value);
+                $output = "var $name = " . json_encode( $value ) . ";\n";
             }
         }
@@ -217 +220 @@
     }
 
+    function decode_html_entities($data) {
+        foreach ( (array) $data as $key => $value ) {
+            if ( is_array($value) )
+                $data[$key] = $this->decode_html_entities($value);
+            elseif ( is_string($value) )
+                $data[$key] = html_entity_decode($value, ENT_QUOTES, 'UTF-8');
+        }
+        return $data;
+    }
+
     function reset() {
         $this->do_concat = false;