WordPress 3.4.2

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

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index ebb99c5ef69230a20757c8ff44b2841ee83f81b9..015ced3013a14a49aecc0fd2fb8d9ff21c2a1190 100644 (file)
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -7,21 +7,21 @@
  */
 
 /**
- * In WordPress Administration Panels
+ * In WordPress Administration Screens
  *
  * @since 2.3.2
  */
 if ( ! defined('WP_ADMIN') )
-       define('WP_ADMIN', TRUE);
+       define('WP_ADMIN', true);
 
 if ( ! defined('WP_NETWORK_ADMIN') )
-       define('WP_NETWORK_ADMIN', FALSE);
+       define('WP_NETWORK_ADMIN', false);
 
 if ( ! defined('WP_USER_ADMIN') )
-       define('WP_USER_ADMIN', FALSE);
+       define('WP_USER_ADMIN', false);
 
 if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
-       define('WP_BLOG_ADMIN', TRUE);
+       define('WP_BLOG_ADMIN', true);
 }
 
 if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
@@ -30,7 +30,7 @@ if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
 require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
 
 if ( get_option('db_upgraded') ) {
-       $wp_rewrite->flush_rules();
+       flush_rewrite_rules();
        update_option( 'db_upgraded',  false );
 
        /**
@@ -39,7 +39,7 @@ if ( get_option('db_upgraded') ) {
         * @since 2.8
         */
        do_action('after_db_upgrade');
-} elseif ( get_option('db_version') != $wp_db_version ) {
+} elseif ( get_option('db_version') != $wp_db_version && empty($_POST) ) {
        if ( !is_multisite() ) {
                wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
                exit;
@@ -88,13 +88,13 @@ if ( isset($_GET['page']) ) {
        $plugin_page = plugin_basename($plugin_page);
 }
 
-if ( isset($_GET['post_type']) )
-       $typenow = sanitize_key($_GET['post_type']);
+if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+       $typenow = $_REQUEST['post_type'];
 else
        $typenow = '';
 
-if ( isset($_GET['taxonomy']) )
-       $taxnow = sanitize_key($_GET['taxonomy']);
+if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+       $taxnow = $_REQUEST['taxonomy'];
 else
        $taxnow = '';
 
@@ -106,7 +106,7 @@ else
        require(ABSPATH . 'wp-admin/menu.php');
 
 if ( current_user_can( 'manage_options' ) )
-       @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', '256M' ) );
+       @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
 
 do_action('admin_init');
 
@@ -153,7 +153,6 @@ if ( isset($plugin_page) ) {
                if ( validate_file($plugin_page) )
                        wp_die(__('Invalid plugin page'));
 
-
                if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
                        wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
 
@@ -183,13 +182,9 @@ if ( isset($plugin_page) ) {
                exit;
        }
 
-       // Allow plugins to define importers as well
-       if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) {
-               if (! file_exists(ABSPATH . "wp-admin/import/$importer.php")) {
-                       wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
-                       exit;
-               }
-               include(ABSPATH . "wp-admin/import/$importer.php");
+       if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]) ) {
+               wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
+               exit;
        }
 
        $parent_file = 'tools.php';
@@ -211,8 +206,7 @@ if ( isset($plugin_page) ) {
        include(ABSPATH . 'wp-admin/admin-footer.php');
 
        // Make sure rules are flushed
-       global $wp_rewrite;
-       $wp_rewrite->flush_rules(false);
+       flush_rewrite_rules(false);
 
        exit();
 } else {
@@ -234,5 +228,3 @@ if ( isset($plugin_page) ) {
 
 if ( !empty($_REQUEST['action']) )
        do_action('admin_action_' . $_REQUEST['action']);
-
-?>