WordPress.org
Get WordPress

Make WordPress Core

Changeset 11366


Ignore:
Timestamp:
05/16/2009 07:21:29 PM (15 years ago)
Author:
azaozz
Message:

Add footer actions to iframe footer, props DD32, fixes #9832

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/includes/template.php

    r11353 r11366  
    33243324 *
    33253325 */
    3326 function iframe_header( $title = '', $limit_styles = false) {
     3326function iframe_header( $title = '', $limit_styles = false ) {
    33273327?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    33283328<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
    … …  
    33593359 */
    33603360function iframe_footer() {
    3361     echo '
    3362     <script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
    3363     </body>
    3364 </html>';
     3361    //We're going to hide any footer output on iframe pages, but run the hooks anyway since they output Javascript or other needed content. ?>
     3362    <div class="hidden">
     3363<?php
     3364    do_action('admin_footer', '');
     3365    do_action('admin_print_footer_scripts'); ?>
     3366    </div>
     3367<script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
     3368</body>
     3369</html>
     3370<?php
    33653371}
    33663372

  • trunk/wp-admin/plugin-install.php

    r11005 r11366  
    1919
    2020wp_reset_vars( array('tab', 'paged') );
    21 wp_enqueue_style( 'plugin-install' );
    22 wp_enqueue_script( 'plugin-install' );
    23 add_thickbox();
    2421
    2522//These are the tabs which are shown on the page,
    … …  
    4643if( empty($paged) )
    4744    $paged = 1;
     45
     46wp_enqueue_style( 'plugin-install' );
     47wp_enqueue_script( 'plugin-install' );
     48if ( 'plugin-information' != $tab )
     49    add_thickbox();
    4850
    4951$body_id = $tab;

  • trunk/wp-includes/script-loader.php

    r11354 r11366  
    370370        ) );
    371371
    372         $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'thickbox', 'jquery' ), '20090506' );
     372        $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery' ), '20090506' );
    373373        $scripts->add_data( 'plugin-install', 'group', 1 );
    374374        $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
Note: See TracChangeset for help on using the changeset viewer.