summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-admin/admin.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-01-10 13:17:40 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-01-10 13:17:40 +0000
commit0cc51d943e5a8ffaa7bd7d8bf798f931ac794552 (patch)
treee7b50b853bde70e193b22c0096a96f97503ff7f9 /wp-inst/wp-admin/admin.php
parenta50cf6f1689a7a4e509d379580e3bb15195992d8 (diff)
downloadwordpress-mu-0cc51d943e5a8ffaa7bd7d8bf798f931ac794552.tar.gz
wordpress-mu-0cc51d943e5a8ffaa7bd7d8bf798f931ac794552.tar.xz
wordpress-mu-0cc51d943e5a8ffaa7bd7d8bf798f931ac794552.zip
WP Merge.
Also fixes for kses that ate tags, and category js git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@497 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/admin.php')
-rw-r--r--wp-inst/wp-admin/admin.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/wp-inst/wp-admin/admin.php b/wp-inst/wp-admin/admin.php
index 202fd2c..ab1c8b3 100644
--- a/wp-inst/wp-admin/admin.php
+++ b/wp-inst/wp-admin/admin.php
@@ -40,6 +40,8 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
}
}
+$xfn_js = $sack_js = $list_js = $cat_js = $dbx_js = $editing = false;
+
require(ABSPATH . '/wp-admin/menu.php');
// Handle plugin admin pages.