From 24f1c22adf89be21f57e7e6f26c5316cfef007f7 Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Sat, 6 Dec 2008 09:54:24 +0000
Subject: [PATCH] Move convertEntities js function into the BackPress
 scriptloader. Fixes #8505 props sambauers.

git-svn-id: https://develop.svn.wordpress.org/trunk@10086 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/admin-header.php        | 20 --------------------
 wp-includes/class.wp-scripts.php | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index b0dc2b9e80..62200656b0 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -29,26 +29,6 @@ wp_admin_css( 'css/ie' );
 <script type="text/javascript">
 //<![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 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 === 'string' )
-		return c(o);
-	else if ( typeof o === 'object' )
-		for (var v in o) {
-			if ( typeof o[v] === 'string' )
-				o[v] = c(o[v]);
-		}
-	return o;
-};
 //]]>
 </script>
 <?php
diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index 0349622e00..19ef075a58 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -44,6 +44,25 @@ class WP_Scripts extends WP_Dependencies {
 
 		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 ) {