From f69da836bf9fb514ac3de562faec985b2646cd3a Mon Sep 17 00:00:00 2001 From: azaozz Date: Sat, 16 May 2009 19:21:29 +0000 Subject: [PATCH] Add footer actions to iframe footer, props DD32, fixes #9832 git-svn-id: http://svn.automattic.com/wordpress/trunk@11366 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/template.php | 16 +++++++++++----- wp-admin/plugin-install.php | 10 ++++++---- wp-includes/script-loader.php | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 43dfd0ed6b..e4d7f8968c 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -3323,7 +3323,7 @@ function _admin_search_query() { * @param bool $limit_styles Limit styles to colour-related styles only (unless others are enqueued). * */ -function iframe_header( $title = '', $limit_styles = false) { +function iframe_header( $title = '', $limit_styles = false ) { ?> > @@ -3358,10 +3358,16 @@ do_action('admin_head'); * */ function iframe_footer() { - echo ' - - -'; + //We're going to hide any footer output on iframe pages, but run the hooks anyway since they output Javascript or other needed content. ?> + + + + + $text ) { 'try{convertEntities(inlineEditL10n);}catch(e){};' ) ); - $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'thickbox', 'jquery' ), '20090506' ); + $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery' ), '20090506' ); $scripts->add_data( 'plugin-install', 'group', 1 ); $scripts->localize( 'plugin-install', 'plugininstallL10n', array( 'plugin_information' => __('Plugin Information:'),