Changeset 12846
- Timestamp:
- 01/26/2010 06:16:53 PM (15 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/admin-header.php
r12783 r12846 54 54 do_action('admin_head'); 55 55 56 if ( get_user_setting('mfold') == 'f' ) {56 if ( get_user_setting('mfold') == 'f' ) 57 57 $admin_body_class .= ' folded'; 58 }59 58 60 59 if ( $is_iphone ) { ?> … … 85 84 $blog_name_excerpt = trim($blog_name_excerpt) . '…'; 86 85 $blog_name = $blog_name_excerpt; 86 unset($blog_name_excerpt); 87 87 } 88 88 $title_class = ''; … … 111 111 <div id="wpbody"> 112 112 <?php 113 unset($title_class, $blog_name); 114 113 115 require(ABSPATH . 'wp-admin/menu-header.php'); 114 116 … … 124 126 do_action('admin_notices'); 125 127 126 if ( $parent_file == 'options-general.php' ) {128 if ( $parent_file == 'options-general.php' ) 127 129 require(ABSPATH . 'wp-admin/options-head.php'); 128 } -
trunk/wp-admin/admin.php
r12797 r12846 43 43 $response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) ); 44 44 do_action( 'after_mu_upgrade', $response ); 45 unset($response); 45 46 } 47 unset($c); 46 48 } 47 49 } … … 124 126 do_action($page_hook); 125 127 } else { 126 if ( validate_file($plugin_page) ) {128 if ( validate_file($plugin_page) ) 127 129 wp_die(__('Invalid plugin page')); 128 } 130 129 131 130 132 if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) ) … … 133 135 do_action('load-' . $plugin_page); 134 136 135 if ( !isset($_GET['noheader']))137 if ( !isset($_GET['noheader'])) 136 138 require_once(ABSPATH . 'wp-admin/admin-header.php'); 137 139 … … 157 159 158 160 // Allow plugins to define importers as well 159 if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) 160 { 161 if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) { 161 162 if (! file_exists(ABSPATH . "wp-admin/import/$importer.php")) 162 {163 163 wp_die(__('Cannot load importer.')); 164 }165 164 include(ABSPATH . "wp-admin/import/$importer.php"); 166 165 }
Note: See TracChangeset
for help on using the changeset viewer.