Ticket #28947: 28947.2.diff

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

@@ -18 +18 @@
 
         public $upgrader;
         public $done_header = false;
+        public $done_footer = false;
         public $result = false;
 
         public function __construct($args = array()) {
@@ -47 +48 @@
         }
 
         public function header() {
-                if ( $this->done_header )
+                if ( $this->done_header ) {
                         return;
+                }
                 $this->done_header = true;
                 echo '<div class="wrap">';
                 echo '<h2>' . $this->options['title'] . '</h2>';
         }
         public function footer() {
+                if ( $this->done_footer ) {
+                        return;
+                }
+                $this->done_footer = true;
                 echo '</div>';
         }
 
@@ -628 +634 @@
 class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
         public $language_update = null;
         public $done_header = false;
+        public $done_footer = false;
         public $display_footer_actions = true;
 
         public function __construct( $args = array() ) {
@@ -635 +642 @@
                 $args = wp_parse_args( $args, $defaults );
                 if ( $args['skip_header_footer'] ) {
                         $this->done_header = true;
+                        $this->done_footer = true;
                         $this->display_footer_actions = false;
                 }
                 parent::__construct( $args );