WP Merge and new features

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

1 files changed, 4 insertions, 2 deletions

diff --git a/wp-inst/wp-admin/admin.php b/wp-inst/wp-admin/admin.php
index 4cedbbe..dda460b 100644
--- a/wp-inst/wp-admin/admin.php
+++ b/wp-inst/wp-admin/admin.php
@@ -17,7 +17,7 @@ nocache_headers();
 
 update_category_cache();
 
-get_currentuserinfo();
+wp_get_current_user();
 
 $posts_per_page = get_settings('posts_per_page');
 $what_to_show = get_settings('what_to_show');
@@ -40,7 +40,9 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     }
 }
 
-$xfn_js = $sack_js = $list_js = $cat_js = $dbx_js = $editing = false;
+wp_enqueue_script( 'fat' );
+
+$editing = false;
 
 require(ABSPATH . '/wp-admin/menu.php');