Wordpress 2.6.2

[autoinstalls/wordpress.git] / wp-admin / admin.php

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 0a6f22ae550dd975fcbcaf12f6efee10ef550e50..20ff3693f5562b4e1d21c8ba6bee960223d995e0 100644 (file)
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -2,12 +2,12 @@
 define('WP_ADMIN', TRUE);
 
 if ( defined('ABSPATH') )
-       require_once( ABSPATH . 'wp-config.php');
+       require_once(ABSPATH . 'wp-load.php');
 else
-    require_once('../wp-config.php');
+       require_once('../wp-load.php');
 
 if ( get_option('db_version') != $wp_db_version ) {
-       wp_redirect(get_option('siteurl') . '/wp-admin/upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI'])));
+       wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
        exit;
 }
 
@@ -19,8 +19,6 @@ nocache_headers();
 
 update_category_cache();
 
-wp_get_current_user();
-
 $posts_per_page = get_option('posts_per_page');
 $what_to_show = get_option('what_to_show');
 $date_format = get_option('date_format');
@@ -28,7 +26,11 @@ $time_format = get_option('time_format');
 
 wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
 
-wp_enqueue_script( 'fat' );
+wp_admin_css_color('classic', __('Classic'), admin_url("css/colors-classic.css"), array('#07273E', '#14568A', '#D54E21', '#2683AE'));
+wp_admin_css_color('fresh', __('Fresh'), admin_url("css/colors-fresh.css"), array('#464646', '#CEE1EF', '#D54E21', '#2683AE'));
+
+wp_enqueue_script( 'common' );
+wp_enqueue_script( 'jquery-color' );
 
 $editing = false;
 
@@ -39,6 +41,8 @@ if (isset($_GET['page'])) {
 
 require(ABSPATH . 'wp-admin/menu.php');
 
+do_action('admin_init');
+
 // Handle plugin admin pages.
 if (isset($plugin_page)) {
        $page_hook = get_plugin_page_hook($plugin_page, $pagenow);
@@ -54,7 +58,7 @@ if (isset($plugin_page)) {
                        wp_die(__('Invalid plugin page'));
                }
 
-               if (! file_exists(ABSPATH . PLUGINDIR . "/$plugin_page"))
+               if (! ( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) )
                        wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
 
                do_action('load-' . $plugin_page);
@@ -62,7 +66,7 @@ if (isset($plugin_page)) {
                if (! isset($_GET['noheader']))
                        require_once(ABSPATH . 'wp-admin/admin-header.php');
 
-               include(ABSPATH . PLUGINDIR . "/$plugin_page");
+               include(WP_PLUGIN_DIR . "/$plugin_page");
        }
 
        include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -109,4 +113,7 @@ if (isset($plugin_page)) {
        do_action("load-$pagenow");
 }
 
+if ( !empty($_REQUEST['action']) )
+       do_action('admin_action_' . $_REQUEST['action']);
+
 ?>