WordPress.org

Make WordPress Core

Changeset 32082


Ignore:
Timestamp:
04/08/2015 05:37:38 PM (4 years ago)
Author:
jorbin
Message:

Disable shiny updates from modal based on parent window

The QS method added in [32067] and modified in [32080] doesn't work when the user changes the tab inside the modal. Instead, let's use the parent window's location.

Fixes #31739

Location:
trunk/src/wp-admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/js/updates.js

    r32080 r32082  
    482482            $.support.postMessage = !! window.postMessage;
    483483
    484             if ( $.support.postMessage === false || target === null || window.location.search.indexOf( 'parent=update-core' ) !== -1 )
     484            if ( $.support.postMessage === false || target === null || window.parent.location.pathname.indexOf( 'update-core.php' ) !== -1 )
    485485                return;
    486486
  • trunk/src/wp-admin/update-core.php

    r32080 r32082  
    265265        }
    266266
    267         $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');
     267        $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');
    268268        $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version);
    269269        $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);
Note: See TracChangeset for help on using the changeset viewer.