Changeset 12728 for trunk/wp-admin/admin-header.php

Timestamp:

01/15/2010 04:58:36 PM (15 years ago)

Author:

ryan

Message:

Merge edit-pages.php into edit.php. see #9674

File:

• trunk/wp-admin/admin-header.php (modified) (2 diffs)

trunk/wp-admin/admin-header.php

@@ -29 +29 @@
     wp_admin_css( 'css/ms' );
 wp_enqueue_script('utils');
-
-$hook_suffix = '';
-if ( isset($page_hook) )
-    $hook_suffix = $page_hook;
-else if ( isset($plugin_page) )
-    $hook_suffix = $plugin_page;
-else if ( isset($pagenow) )
-    $hook_suffix = $pagenow;
-
-if ( isset($submenu_file) && (false !== $pos = strpos($submenu_file, 'post_type=')) )
-    $typenow = substr($submenu_file, $pos + 10);
-elseif ( isset($parent_file) && (false !== $pos = strpos($parent_file, 'post_type=')) )
-    $typenow = substr($parent_file, $pos + 10);
-else
-    $typenow = '';
 
 $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
@@ -120 +105 @@
 </div>
 
-<?php favorite_actions($hook_suffix); ?>
+<?php favorite_actions($current_screen); ?>
 </div>
 </div>
 
 <div id="wpbody">
-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
+<?php
+require(ABSPATH . 'wp-admin/menu-header.php');
+
+$current_screen->parent_file = $parent_file;
+$current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file);
+$current_screen->parent_base = str_replace('.php', '', $current_screen->parent_base);
+?>
 
 <div id="wpbody-content">
 <?php
-screen_meta($hook_suffix);
+screen_meta($current_screen);
 
 do_action('admin_notices');