Changeset 9809

Timestamp:

11/20/2008 10:54:59 AM (16 years ago)

Author:

azaozz

Message:

Filter HTML entities when inserting strings with js, includes patch by nbachiyski, fixes #8254

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/js/common.js (modified) (3 diffs)
• wp-includes/class.wp-scripts.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -29 +29 @@
 //<![CDATA[
 addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document).ready(func); else if (typeof wpOnload!='function'){wpOnload=func;} else {var oldonload=wpOnload; wpOnload=function(){oldonload();func();}}};
+
+function convertEntities(o) {
+    var p = document.createElement('p');
+    var c = function(s) { p.innerHTML = s; return p.innerHTML; }
+
+    if ( typeof o === 'object' )
+        for (var v in o)
+            o[v] = c(o[v]);
+
+    else if ( typeof o === 'string' )
+        return c(o);
+
+    p = null;
+};
 //]]>
 </script>

trunk/wp-admin/js/common.js

@@ -216 +216 @@
 
 var showNotice, adminMenu, columns;
-(function($){
+
 // stub for doing better warnings
 showNotice = {
@@ -230 +230 @@
     }
 };
-})(jQuery);
 
 (function($){
@@ -351 +350 @@
 
 })(jQuery);
-
-
 /*
 (function($) {
-    $.fn.tTips = function() {
-
-        $('body').append('<div id="tTips"><p id="tTips_inside"></p></div>');
-        var TT = $('#tTips');
-
-        this.each(function() {
-            var el = $(this), txt;
-
-            if ( txt = el.attr('title') ) el.attr('tip', txt).removeAttr('title');
-            else return;
-            el.find('img').removeAttr('alt');
-
-            el.mouseover(function(e) {
-                txt = el.attr('tip'), o = el.offset();
-
-                clearTimeout(TT.sD);
-                TT.find('p').html(txt);
-
-                TT.css({'top': o.top - 43, 'left': o.left - 5});
-                TT.sD = setTimeout(function(){TT.fadeIn(150);}, 100);
-            });
-
-            el.mouseout(function() {
-                clearTimeout(TT.sD);
-                TT.css({display : 'none'});
-            })
-        });
-    }
-}(jQuery));
+    $.attrEn = function(elem, name, value) {
+        if ( typeof value === 'string' )
+            value = $('<span>'+value+'</span>').html();
+        return $.attr(elem, name, value);
+    }
+    $.fn.valEn = function(value) {
+        if ( typeof value === 'string' )
+            value = $('<span>'+value+'</span>').html();
+        return $.fn.val.call(this, value);
+    }
+})(jQuery);
 */
-
-//jQuery(function(){jQuery('#media-buttons a').tTips();});

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

@@ -52 +52 @@
         }
         echo "\n\t}\n";
+        echo "try{convertEntities($object_name);}catch(e){};\n";
         echo "/* ]]> */\n";
         echo "</script>\n";