Ticket #11232: 11232.patch

wp-admin/css/wp-admin.dev.css

@@ -3752 +3752 @@
         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%;
+}

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

@@ -466 +466 @@
                         return false;
                 }
 
+                $this->skin->feedback('bulk_upgrade_start');
                 $this->maintenance_mode(true);
 
                 $results = array();
@@ -507 +508 @@
                         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 +708 @@
                         return false;
                 }
 
+                $this->skin->feedback('bulk_upgrade_start');
                 $this->maintenance_mode(true);
 
                 $results = array();
@@ -745 +750 @@
                         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.
@@ -1056 +1063 @@
         }
 
         function add_strings() {
+                $this->upgrader->strings['bulk_upgrade_start'] = __('The update process will start now. It may take awhile to finish.');
                 $this->upgrader->strings['skin_update_failed_error'] = __('An error occured while updating %1$s: <strong>%2$s</strong>.');
                 $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
                 $this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>'.__('Show Details').'</span><span class="hidden">'.__('Hide Details').'</span>.</a>';
+                $this->upgrader->strings['bulk_upgrade_end'] = __('The update process is complete.');
         }
 
         function feedback($string) {
@@ -1103 +1112 @@
 
         function before($title = '') {
                 $this->in_loop = true;
-                printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . '</h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
+                printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <img alt="" src="' . admin_url( 'images/wpspin_light.gif' ) . '" class="hidden waiting-' . $this->upgrader->update_current . '" style="vertical-align:middle;"></h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
+                echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
                 echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
                 $this->flush_output();
         }
@@ -1120 +1130 @@
                 }
                 if ( !empty($this->result) && !is_wp_error($this->result) ) {
                         echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
+                        echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
                 }
                 $this->reset();
                 $this->flush_output();

wp-admin/update-core.php

@@ -418 +418 @@
         echo '<div class="wrap">';
         screen_icon('plugins');
         echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
-        echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
+        echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
         echo '</div>';
 } elseif ( 'do-theme-upgrade' == $action ) {
         check_admin_referer('upgrade-core');
@@ -441 +441 @@
         echo '<div class="wrap">';
         screen_icon('themes');
         echo '<h2>' . esc_html__('Update Themes') . '</h2>';
-        echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
+        echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
         echo '</div>';
 }