Changeset 11012

Timestamp:

04/20/2009 06:15:08 PM (17 years ago)

Author:

ryan

Message:

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

Location:

trunk/wp-admin

Files:

• includes/class-wp-upgrader.php (modified) (3 diffs)
• update.php (modified) (2 diffs)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -55 +55 @@
                 global $wp_filesystem;
         
-                if ( false === ($credentials = $this->skin->request_filesystem_credentials()) ) //request_filesystem_credentials($url)) )
+                if ( false === ($credentials = $this->skin->request_filesystem_credentials()) )
                         return false;
         
@@ -259 +259 @@
                 extract($options);
 
-                $this->skin->header();
-                $this->skin->before();
-                
                 //Connect to the Filesystem first.
                 $res = $this->fs_connect( array(WP_CONTENT_DIR, $destination) );
@@ -271 +268 @@
                         return $res;
                 }
-                
+
+                $this->skin->header();
+                $this->skin->before();
+
                 //Download the package (Note, This just returns the filename of the file if the package is a local file)
                 $download = $this->download_package( $package );

trunk/wp-admin/update.php

@@ -78 +78 @@
                 $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
                 $nonce = 'install-plugin_' . $plugin;
-                $url = add_query_arg( array(
-                                                                'plugin' => $plugin,
-                                                                'plugin_name' => $api->name . ' ' . $api->version,
-                                                                'download_url' => $api->download_link
-                                                        ), 'update.php?action=install-plugin');
+                $url = 'update.php?action=install-plugin&plugin=' . $plugin;
                 $type = 'web'; //Install plugin type, From Web or an Upload.
 
@@ -158 +154 @@
                 $title = sprintf( __('Installing theme: %s'), $api->name . ' ' . $api->version );
                 $nonce = 'install-theme_' . $theme;
-                $url = add_query_arg( array(
-                                                                'theme' => $theme,
-                                                                'theme_name' => $api->name . ' ' . $api->version,
-                                                                'download_url' => $api->download_link
-                                                        ), 'update.php?action=install-theme');
+                $url = 'update.php?action=install-theme&theme=' . $theme;
                 $type = 'web'; //Install theme type, From Web or an Upload.