Mergegd code from WP Core.

Make WP ajax play nicely with wpmu ajax.


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@158 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 23 insertions, 15 deletions

diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php
index 88944f4..28d4f2c 100644
--- a/wp-inst/wp-admin/admin-functions.php
+++ b/wp-inst/wp-admin/admin-functions.php
@@ -1412,25 +1412,33 @@ function AJAX_search_box( $get_url, $search_field = 'newvalue', $search_results_
 	}
 	// end from scottandrew.com/junkyard/js/
 
-	var valBox = document.getElementById("<?php echo $search_field ?>");
-	var displayBox = document.getElementById("<?php echo $search_results_field ?>");
-	addEvent(valBox, 'keyup', doTest, false);
-	var keyPressDelay = '';
-
-	var xmlhttp=false;
-	try {
-		xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-	} catch (e) {
+	var valBox = false;
+	var displayBox = false;
+	var keyPressDelay = false;
+	var xmlhttp = false;
+
+	function init_ajax_searchbox() {
+		valBox = document.getElementById("<?php echo $search_field ?>");
+		displayBox = document.getElementById("<?php echo $search_results_field ?>");
+		addEvent(valBox, 'keyup', doTest, false);
+		keyPressDelay = '';
+
+		xmlhttp=false;
 		try {
-			xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-		} catch (E) {
-			xmlhttp = false;
+			xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
+		} catch (e) {
+			try {
+				xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+			} catch (E) {
+				xmlhttp = false;
+			}
 		}
-	}
 
-	if (!xmlhttp && typeof XMLHttpRequest!='undefined') {
-		xmlhttp = new XMLHttpRequest();
+		if (!xmlhttp && typeof XMLHttpRequest!='undefined') {
+			xmlhttp = new XMLHttpRequest();
+		}
 	}
+	addLoadEvent( init_ajax_searchbox );
 
 	function doTest() {
 		if (keyPressDelay) {