Wordpress 3.6

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

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index bd2e5406a6ab55282ba73bc9369ab34f92ec05a8..4e739c3c8d088ce873e4c22b3a26f3ceb3cbe644 100644 (file)
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -43,7 +43,7 @@ if ( get_option('db_upgraded') ) {
        do_action('after_db_upgrade');
 } 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']))));
+               wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
                exit;
        } elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
                /**
@@ -77,14 +77,12 @@ set_screen_options();
 $date_format = get_option('date_format');
 $time_format = get_option('time_format');
 
-wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'text', 'trackback', 'pingback'));
-
 wp_enqueue_script( 'common' );
 
 $editing = false;
 
 if ( isset($_GET['page']) ) {
-       $plugin_page = stripslashes($_GET['page']);
+       $plugin_page = wp_unslash( $_GET['page'] );
        $plugin_page = plugin_basename($plugin_page);
 }