Changeset 29357

Timestamp:

08/02/2014 02:36:31 PM (10 years ago)

Author:

ocean90

Message:

Upgrader: Use always window.postMessage for decrement of update count bubbles when IFRAME_REQUEST is defined.
Fixes decrement of translation update count bubbles when updated through the bulk upgrader.

fixes #29054.

File:

• trunk/src/wp-admin/includes/class-wp-upgrader-skins.php (modified) (2 diffs)

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

@@ -105 +105 @@
             return;
         }
-        echo '<script type="text/javascript">
-                (function( wp ) {
-                    if ( wp && wp.updates.decrementCount ) {
-                        wp.updates.decrementCount( "' . $type . '" );
+
+        if ( defined( 'IFRAME_REQUEST' ) ) {
+            echo '<script type="text/javascript">
+                    if ( window.postMessage && JSON ) {
+                        window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '" } ), window.location.protocol + "//" + window.location.hostname );
                     }
-                })( window.wp );
-            </script>';
+                </script>';
+        } else {
+            echo '<script type="text/javascript">
+                    (function( wp ) {
+                        if ( wp && wp.updates.decrementCount ) {
+                            wp.updates.decrementCount( "' . $type . '" );
+                        }
+                    })( window.wp );
+                </script>';
+        }
     }
 }
@@ -284 +293 @@
         wp_ob_end_flush_all();
         flush();
-    }
-
-    /**
-     * Output JavaScript that sends message to parent window to decrement the update counts.
-     *
-     * @since 3.9.0
-     *
-     * @param string $type Type of update count to decrement. Likely values include 'plugin',
-     *                     'theme', 'translation', etc.
-     */
-    protected function decrement_update_count( $type ) {
-        if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
-            return;
-        }
-        echo '<script type="text/javascript">
-                if ( window.postMessage && JSON ) {
-                    window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '" } ), window.location.protocol + "//" + window.location.hostname );
-                }
-            </script>';
     }
 }