WP Merge

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

1 files changed, 14 insertions, 3 deletions

diff --git a/wp-inst/wp-admin/admin-header.php b/wp-inst/wp-admin/admin-header.php
index 7ac2a48..15ae0b1 100644
--- a/wp-inst/wp-admin/admin-header.php
+++ b/wp-inst/wp-admin/admin-header.php
@@ -83,9 +83,20 @@ addLoadEvent(blurry);
 <script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce_gzip.php?ver=20051211"></script>
 <?php endif; ?>
 <script type="text/javascript" src="../wp-includes/js/dbx.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+	addLoadEvent( function() {
+<?php switch ( $pagenow ) : case 'post.php' : ?>
+        var manager = new dbxManager('postmeta');       //session ID [/-_a-zA-Z0-9/]
+<?php break; case 'page-new.php' : ?>
+        var manager = new dbxManager('pagemeta');       //session ID [/-_a-zA-Z0-9/]
+<?php break; endswitch; ?>
+	});
+//]]>
+</script>
 <script type="text/javascript" src="../wp-includes/js/dbx-key.js"></script>
 
-<?php if ( isset($editing) && current_user_can('manage_categories') ) : ?>
+<?php if ( current_user_can('manage_categories') ) : ?>
 <style type="text/css">
 #newcat { width: 120px; margin-right: 5px; }
 input#catadd { 	background: #a4a4a4;
@@ -113,6 +124,7 @@ input#catadd { 	background: #a4a4a4;
 }
 </style>
 <script type="text/javascript">
+//<![CDATA[
 var ajaxCat = new sack();
 var newcat;
  
@@ -245,8 +257,6 @@ function newCatCompletion() {
 	}
 	p.parentNode.removeChild(p);
 //	var id = parseInt(ajaxCat.response, 10);
-
-
 }
 
 function ajaxNewCatKeyPress(e) {
@@ -302,6 +312,7 @@ function myPload( str ) {
 		fixedExplode[count] = currentElement;
 	return fixedExplode;
 }
+//]]>
 </script>
 <?php endif; ?>