Ticket #8505: 8505-4.patch

wp-includes/class.wp-scripts.php

@@ -44 +44 @@
 
                 echo "<script type='text/javascript'>\n";
                 echo "/* <![CDATA[ */\n";
-                echo "function convertEntities(o) {\n";
-                echo "  var c = function(s) {\n";
-                echo "          if (/&[^;]+;/.test(s)) {\n";
-                echo "                  var e = document.createElement('div');\n";
-                echo "                  e.innerHTML = s;\n";
-                echo "                  return !e.firstChild ? s : e.firstChild.nodeValue;\n";
-                echo "          }\n";
-                echo "          return s;\n";
-                echo "  }\n";
-                echo "  if ( typeof o === 'string' ) {\n";
-                echo "          return c(o);\n";
-                echo "  } else if ( typeof o === 'object' ) {\n";
-                echo "          for (var v in o) {\n";
-                echo "                  if ( typeof o[v] === 'string' )\n";
-                echo "                          o[v] = c(o[v]);\n";
-                echo "          }\n";
-                echo "  }\n";
-                echo "  return o;\n";
-                echo "};\n";
                 echo "\t$object_name = {\n";
                 $eol = '';
                 foreach ( $this->registered[$handle]->extra['l10n'][1] as $var => $val ) {
+                        if ( 'i18n_print_after' == $var ) {
+                                $after = js_escape( $val );
+                                continue;
+                        }
                         echo "$eol\t\t$var: \"" . js_escape( $val ) . '"';
                         $eol = ",\n";
                 }
                 echo "\n\t}\n";
-                echo "try{convertEntities($object_name);}catch(e){};\n";
+                echo isset($after) ? "\t$after\n" : '';
                 echo "/* ]]> */\n";
                 echo "</script>\n";