Changeset 9836 for trunk/wp-admin/admin-header.php

Timestamp:

11/21/2008 07:36:57 PM (16 years ago)

Author:

azaozz

Message:

Improve filtering of HTML entities from translated strings used in js, see #8254

File:

• trunk/wp-admin/admin-header.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -31 +31 @@
 
 function convertEntities(o) {
-    var p = document.createElement('p');
-    var c = function(s) { p.innerHTML = s; return p.innerHTML; }
+    var c = function(s) {
+        if (/&[^;]+;/.test(s)) {
+            var e = document.createElement("div");
+            e.innerHTML = s;
+            return !e.firstChild ? s : e.firstChild.nodeValue;
+        }
+        return s;
+    }
 
-    if ( typeof o === 'object' )
+    if ( typeof o === 'object' ) {
         for (var v in o)
             o[v] = c(o[v]);
-
-    else if ( typeof o === 'string' )
+        return o;
+    } else if ( typeof o === 'string' )
         return c(o);
-
-    p = null;
 };
 //]]>