Changeset 32080

Timestamp:

04/08/2015 05:26:05 PM (9 years ago)

Author:

jorbin

Message:

Fix logic for details based shiny updates.

This fixes two problems. TB seems to sometimes strip window.location.search variables after tb ones, so we need to move it forward. Also fixes logic error.

See #31739

Location:

trunk/src/wp-admin

Files:

• js/updates.js (modified) (1 diff)
• update-core.php (modified) (1 diff)

trunk/src/wp-admin/js/updates.js

@@ -482 +482 @@
             $.support.postMessage = !! window.postMessage;
 
-            if ( $.support.postMessage === false || target === null || window.location.search.indexOf( 'parent=update-core' ) === -1 )
+            if ( $.support.postMessage === false || target === null || window.location.search.indexOf( 'parent=update-core' ) !== -1 )
                 return;
 

trunk/src/wp-admin/update-core.php

@@ -265 +265 @@
         }
 
-        $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&section=changelog&TB_iframe=true&width=640&height=662&parent=update-core');
+        $details_url = self_admin_url('plugin-install.php?tab=plugin-information&parent=update-core&plugin=' . $plugin_data->update->slug . '&section=changelog&TB_iframe=true&width=640&height=662');
         $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version);
         $details = sprintf('<a href="%1$s" class="thickbox" title="%2$s">%3$s</a>.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text);