Make WordPress Core

Changeset 11012


Ignore:
Timestamp:
04/20/2009 06:15:08 PM (13 years ago)
Author:
ryan
Message:

Install/upgrade cleanups. Props DD32, sivel. see #7875

Location:
trunk/wp-admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/class-wp-upgrader.php

    r11005 r11012  
    5555        global $wp_filesystem;
    5656   
    57         if ( false === ($credentials = $this->skin->request_filesystem_credentials()) ) //request_filesystem_credentials($url)) )
     57        if ( false === ($credentials = $this->skin->request_filesystem_credentials()) )
    5858            return false;
    5959   
     
    259259        extract($options);
    260260
    261         $this->skin->header();
    262         $this->skin->before();
    263        
    264261        //Connect to the Filesystem first.
    265262        $res = $this->fs_connect( array(WP_CONTENT_DIR, $destination) );
     
    271268            return $res;
    272269        }
    273        
     270
     271        $this->skin->header();
     272        $this->skin->before();
     273
    274274        //Download the package (Note, This just returns the filename of the file if the package is a local file)
    275275        $download = $this->download_package( $package );
  • trunk/wp-admin/update.php

    r11005 r11012  
    7878        $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
    7979        $nonce = 'install-plugin_' . $plugin;
    80         $url = add_query_arg( array(
    81                                 'plugin' => $plugin,
    82                                 'plugin_name' => $api->name . ' ' . $api->version,
    83                                 'download_url' => $api->download_link
    84                             ), 'update.php?action=install-plugin');
     80        $url = 'update.php?action=install-plugin&plugin=' . $plugin;
    8581        $type = 'web'; //Install plugin type, From Web or an Upload.
    8682
     
    158154        $title = sprintf( __('Installing theme: %s'), $api->name . ' ' . $api->version );
    159155        $nonce = 'install-theme_' . $theme;
    160         $url = add_query_arg( array(
    161                                 'theme' => $theme,
    162                                 'theme_name' => $api->name . ' ' . $api->version,
    163                                 'download_url' => $api->download_link
    164                             ), 'update.php?action=install-theme');
     156        $url = 'update.php?action=install-theme&theme=' . $theme;
    165157        $type = 'web'; //Install theme type, From Web or an Upload.
    166158   
Note: See TracChangeset for help on using the changeset viewer.