<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12731] trunk/wp-admin/admin.php:
Move current_screen setup before plugin page handling so it is defined for all cases
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12731">12731</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-15 20:21:18 +0000 (Fri, 15 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move current_screen setup before plugin page handling so it is defined for all cases. see <a href="http://trac.wordpress.org/ticket/9674">#9674</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (12730 => 12731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-01-15 18:02:34 UTC (rev 12730)
+++ trunk/wp-admin/admin.php 2010-01-15 20:21:18 UTC (rev 12731)
</span><span class="lines">@@ -82,8 +82,7 @@
</span><span class="cx">
</span><span class="cx"> do_action('admin_init');
</span><span class="cx">
</span><del>-// Handle plugin admin pages.
-if (isset($plugin_page)) {
</del><ins>+if (isset($plugin_page) ) {
</ins><span class="cx"> if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) {
</span><span class="cx"> $page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
</span><span class="cx"> // backwards compatibility for plugins using add_management_page
</span><span class="lines">@@ -97,7 +96,49 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><ins>+$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($_GET['post_type']) )
+ $typenow = $_GET['post_type'];
+else
+ $typenow = '';
+// @todo validate typenow against post types.
+
+/**
+ * Global object containing info about the current screen.
+ */
+$current_screen = $hook_suffix;
+$current_screen = str_replace('.php', '', $current_screen);
+$current_screen = str_replace('-new', '', $current_screen);
+$current_screen = str_replace('-add', '', $current_screen);
+$current_screen = array('id' => $current_screen, 'base' => $current_screen);
+$current_screen = (object) $current_screen;
+if ( 'edit' == $current_screen->id ) {
+ if ( empty($typenow) )
+ $typenow = 'post';
+ $current_screen->id .= '-' . $typenow;
+ $current_screen->post_type = $typenow;
+} elseif ( 'post' == $current_screen->id ) {
+ if ( empty($typenow) )
+ $typenow = 'post';
+ $current_screen->id = $typenow;
+ $current_screen->post_type = $typenow;
+} else {
+ $typenow = '';
+}
+
+$current_screen = apply_filters('current_screen', $current_screen);
+
+// Handle plugin admin pages.
+if ( isset($plugin_page) ) {
</ins><span class="cx"> if ( $page_hook ) {
</span><span class="cx"> do_action('load-' . $page_hook);
</span><span class="cx"> if (! isset($_GET['noheader']))
</span><span class="lines">@@ -177,43 +218,4 @@
</span><span class="cx"> if ( !empty($_REQUEST['action']) )
</span><span class="cx"> do_action('admin_action_' . $_REQUEST['action']);
</span><span class="cx">
</span><del>-$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($_GET['post_type']) )
- $typenow = $_GET['post_type'];
-else
- $typenow = '';
-// @todo validate typenow against post types.
-
-/**
- * Global object containing info about the current screen.
- */
-$current_screen = $hook_suffix;
-$current_screen = str_replace('.php', '', $current_screen);
-$current_screen = str_replace('-new', '', $current_screen);
-$current_screen = str_replace('-add', '', $current_screen);
-$current_screen = array('id' => $current_screen, 'base' => $current_screen);
-$current_screen = (object) $current_screen;
-if ( 'edit' == $current_screen->id ) {
- if ( empty($typenow) )
- $typenow = 'post';
- $current_screen->id .= '-' . $typenow;
- $current_screen->post_type = $typenow;
-} elseif ( 'post' == $current_screen->id ) {
- if ( empty($typenow) )
- $typenow = 'post';
- $current_screen->id = $typenow;
- $current_screen->post_type = $typenow;
-} else {
- $typenow = '';
-}
-
-$current_screen = apply_filters('current_screen', $current_screen);
-
</del><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>