diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css index b5bc4179bc..8984fb37d4 100644 --- a/wp-admin/css/wp-admin.dev.css +++ b/wp-admin/css/wp-admin.dev.css @@ -3752,3 +3752,8 @@ h2 .nav-tab { padding: 4px 20px 6px; font: italic normal normal 24px/35px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; } + +/* Scrollbar fix for bulk upgrade iframe */ +body.update-php { + height: 98%; +} diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index cd295420f7..911cc740b7 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -466,6 +466,7 @@ class Plugin_Upgrader extends WP_Upgrader { return false; } + $this->skin->feedback('bulk_upgrade_start'); $this->maintenance_mode(true); $results = array(); @@ -507,7 +508,10 @@ class Plugin_Upgrader extends WP_Upgrader { if ( false === $result ) break; } //end foreach $plugins + $this->maintenance_mode(false); + $this->skin->feedback('bulk_upgrade_end'); + $this->skin->footer(); // Cleanup our hooks, incase something else does a upgrade on this connection. @@ -704,6 +708,7 @@ class Theme_Upgrader extends WP_Upgrader { return false; } + $this->skin->feedback('bulk_upgrade_start'); $this->maintenance_mode(true); $results = array(); @@ -745,7 +750,9 @@ class Theme_Upgrader extends WP_Upgrader { if ( false === $result ) break; } //end foreach $plugins + $this->maintenance_mode(false); + $this->skin->feedback('bulk_upgrade_end'); $this->skin->footer(); // Cleanup our hooks, incase something else does a upgrade on this connection. @@ -1057,9 +1064,11 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { } function add_strings() { + $this->upgrader->strings['bulk_upgrade_start'] = __('The update process is starting. This process may take awhile on some hosts, so please be patient.'); $this->upgrader->strings['skin_update_failed_error'] = __('An error occured while updating %1$s: %2$s.'); $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.'); $this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').'
'; + $this->upgrader->strings['bulk_upgrade_end'] = __('All upgrades have been completed.'); } function feedback($string) { @@ -1100,11 +1109,13 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { } $this->error = implode(', ', $messages); } + echo ''; } function before($title = '') { $this->in_loop = true; - printf( '