golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
azaozz 2009-05-16 19:21:29 +00:00
parent 535aa13c4a
commit f69da836bf
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-admin/includes/template.php
View File

@ -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 ) {
?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
<head>
@ -3358,10 +3358,16 @@ do_action('admin_head');
*
*/
function iframe_footer() {
echo '
<script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
</body>
</html>';
//We're going to hide any footer output on iframe pages, but run the hooks anyway since they output Javascript or other needed content. ?>
<div class="hidden">
<?php
do_action('admin_footer', '');
do_action('admin_print_footer_scripts'); ?>
</div>
<script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
</body>
</html>
<?php
}
function _post_states($post) {

10
wp-admin/plugin-install.php
View File

@ -18,9 +18,6 @@ $title = __('Install Plugins');
$parent_file = 'plugins.php';
wp_reset_vars( array('tab', 'paged') );
wp_enqueue_style( 'plugin-install' );
wp_enqueue_script( 'plugin-install' );
add_thickbox();
//These are the tabs which are shown on the page,
$tabs = array();
@ -46,6 +43,11 @@ if( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_
if( empty($paged) )
$paged = 1;
wp_enqueue_style( 'plugin-install' );
wp_enqueue_script( 'plugin-install' );
if ( 'plugin-information' != $tab )
add_thickbox();
$body_id = $tab;
do_action('install_plugins_pre_' . $tab); //Used to override the general interface, Eg, install or plugin information.
@ -71,4 +73,4 @@ foreach ( (array)$tabs as $action => $text ) {
<?php do_action('install_plugins_' . $tab, $paged); ?>
</div>
<?php
include('admin-footer.php');
include('admin-footer.php');

2
wp-includes/script-loader.php
View File

@ -369,7 +369,7 @@ function wp_default_scripts( &$scripts ) {
'l10n_print_after' => '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:'),