Wordpress 2.3.3

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

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 756cc48062a7ff48cd0bd8873f996430c0478773..0a6f22ae550dd975fcbcaf12f6efee10ef550e50 100644 (file)
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -1,15 +1,17 @@
 <?php
 <?php

+define('WP_ADMIN', TRUE);
+

 if ( defined('ABSPATH') )
        require_once( ABSPATH . 'wp-config.php');
 else
     require_once('../wp-config.php');
 
 if ( defined('ABSPATH') )
        require_once( ABSPATH . 'wp-config.php');
 else
     require_once('../wp-config.php');
 

-if ( get_option('db_version') != $wp_db_version )
-       die (sprintf(__("Your database is out-of-date.  Please <a href='%s'>upgrade</a>."), get_option('siteurl') . '/wp-admin/upgrade.php'));
-    
-require_once(ABSPATH . 'wp-admin/admin-functions.php');
-require_once(ABSPATH . 'wp-admin/admin-db.php');
-require_once(ABSPATH . WPINC . '/registration-functions.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'])));
+       exit;
+}
+
+require_once(ABSPATH . 'wp-admin/includes/admin.php');

 
 auth_redirect();
 
 
 auth_redirect();
 


@@ -19,94 +21,92 @@ update_category_cache();
 
 wp_get_current_user();
 
 
 wp_get_current_user();
 

-$posts_per_page = get_settings('posts_per_page');
-$what_to_show = get_settings('what_to_show');
-$date_format = get_settings('date_format');
-$time_format = get_settings('time_format');
-
-$wpvarstoreset = array('profile','redirect','redirect_url','a','popuptitle','popupurl','text', 'trackback', 'pingback');
-for ($i=0; $i<count($wpvarstoreset); $i += 1) {
-    $wpvar = $wpvarstoreset[$i];
-    if (!isset($$wpvar)) {
-        if (empty($_POST["$wpvar"])) {
-            if (empty($_GET["$wpvar"])) {
-                $$wpvar = '';
-            } else {
-                $$wpvar = $_GET["$wpvar"];
-            }
-        } else {
-            $$wpvar = $_POST["$wpvar"];
-        }
-    }
-}
+$posts_per_page = get_option('posts_per_page');
+$what_to_show = get_option('what_to_show');
+$date_format = get_option('date_format');
+$time_format = get_option('time_format');
+
+wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));

 
 

-$xfn_js = $sack_js = $list_js = $cat_js = $dbx_js = $editing = false;
+wp_enqueue_script( 'fat' );
+
+$editing = false;

 
 if (isset($_GET['page'])) {
        $plugin_page = stripslashes($_GET['page']);
        $plugin_page = plugin_basename($plugin_page);
 }
 
 
 if (isset($_GET['page'])) {
        $plugin_page = stripslashes($_GET['page']);
        $plugin_page = plugin_basename($plugin_page);
 }
 

-require(ABSPATH . '/wp-admin/menu.php');
+require(ABSPATH . 'wp-admin/menu.php');

 
 // Handle plugin admin pages.
 if (isset($plugin_page)) {
        $page_hook = get_plugin_page_hook($plugin_page, $pagenow);
 
        if ( $page_hook ) {
 
 // Handle plugin admin pages.
 if (isset($plugin_page)) {
        $page_hook = get_plugin_page_hook($plugin_page, $pagenow);
 
        if ( $page_hook ) {

+               do_action('load-' . $page_hook);

                if (! isset($_GET['noheader']))
                if (! isset($_GET['noheader']))

-                       require_once(ABSPATH . '/wp-admin/admin-header.php');
-               
+                       require_once(ABSPATH . 'wp-admin/admin-header.php');
+

                do_action($page_hook);
        } else {
                if ( validate_file($plugin_page) ) {
                do_action($page_hook);
        } else {
                if ( validate_file($plugin_page) ) {

-                       die(__('Invalid plugin page'));
+                       wp_die(__('Invalid plugin page'));

                }
                }

-               
-               if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page"))
-                       die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+
+               if (! file_exists(ABSPATH . PLUGINDIR . "/$plugin_page"))
+                       wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+
+               do_action('load-' . $plugin_page);

 
                if (! isset($_GET['noheader']))
 
                if (! isset($_GET['noheader']))

-                       require_once(ABSPATH . '/wp-admin/admin-header.php');
-               
-               include(ABSPATH . "wp-content/plugins/$plugin_page");
+                       require_once(ABSPATH . 'wp-admin/admin-header.php');
+
+               include(ABSPATH . PLUGINDIR . "/$plugin_page");

        }
        }

-       
+

        include(ABSPATH . 'wp-admin/admin-footer.php');
 
        exit();
 } else if (isset($_GET['import'])) {
        include(ABSPATH . 'wp-admin/admin-footer.php');
 
        exit();
 } else if (isset($_GET['import'])) {

-       
+

        $importer = $_GET['import'];
 
        if ( ! current_user_can('import') )
                wp_die(__('You are not allowed to import.'));
 
        if ( validate_file($importer) ) {
        $importer = $_GET['import'];
 
        if ( ! current_user_can('import') )
                wp_die(__('You are not allowed to import.'));
 
        if ( validate_file($importer) ) {

-               die(__('Invalid importer.'));
+               wp_die(__('Invalid importer.'));
+       }
+
+       // Allow plugins to define importers as well
+       if (! is_callable($wp_importers[$importer][2]))
+       {
+               if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
+               {
+                       wp_die(__('Cannot load importer.'));
+               }
+               include(ABSPATH . "wp-admin/import/$importer.php");

        }
        }

-               
-       if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
-               die(__('Cannot load importer.'));
-       
-       include(ABSPATH . "wp-admin/import/$importer.php");

 
 

-       $parent_file = 'import.php';
+       $parent_file = 'edit.php';
+       $submenu_file = 'import.php';

        $title = __('Import');
        $title = __('Import');

-       
+

        if (! isset($_GET['noheader']))
                require_once(ABSPATH . 'wp-admin/admin-header.php');
 
        if (! isset($_GET['noheader']))
                require_once(ABSPATH . 'wp-admin/admin-header.php');
 

-       require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
+       require_once(ABSPATH . 'wp-admin/includes/upgrade.php');

 
        define('WP_IMPORTING', true);
 
        define('WP_IMPORTING', true);

-       kses_init_filters();  // Always filter imported data with kses.

 
        call_user_func($wp_importers[$importer][2]);
 
        call_user_func($wp_importers[$importer][2]);

-                       
+

        include(ABSPATH . 'wp-admin/admin-footer.php');
 
        exit();
        include(ABSPATH . 'wp-admin/admin-footer.php');
 
        exit();

+} else {
+       do_action("load-$pagenow");

 }
 
 ?>
 }
 
 ?>