<!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>[12797] trunk/wp-admin: Introduce set_current_screen().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12797">12797</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-22 18:27:54 +0000 (Fri, 22 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce set_current_screen(). Set current screen for inline edit ajax requests so post rows can be properly displayed. see <a href="http://trac.wordpress.org/ticket/9674">#9674</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (12796 => 12797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-01-22 17:27:28 UTC (rev 12796)
+++ trunk/wp-admin/admin-ajax.php 2010-01-22 18:27:54 UTC (rev 12797)
</span><span class="lines">@@ -1099,6 +1099,9 @@
</span><span class="cx"> die( __('You are not allowed to edit this post.') );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( isset($_POST['screen']) )
+ set_current_screen($_POST['screen']);
+
</ins><span class="cx"> if ( $last = wp_check_post_lock( $post_ID ) ) {
</span><span class="cx"> $last_user = get_userdata( $last );
</span><span class="cx"> $last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
</span></span></pre></div>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (12796 => 12797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-01-22 17:27:28 UTC (rev 12796)
+++ trunk/wp-admin/admin.php 2010-01-22 18:27:54 UTC (rev 12797)
</span><span class="lines">@@ -112,31 +112,8 @@
</span><span class="cx"> $typenow = '';
</span><span class="cx"> // @todo validate typenow against post types.
</span><span class="cx">
</span><del>-/**
- * 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 = '';
-}
</del><ins>+set_current_screen();
</ins><span class="cx">
</span><del>-$current_screen = apply_filters('current_screen', $current_screen);
-
</del><span class="cx"> // Handle plugin admin pages.
</span><span class="cx"> if ( isset($plugin_page) ) {
</span><span class="cx"> if ( $page_hook ) {
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (12796 => 12797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-01-22 17:27:28 UTC (rev 12796)
+++ trunk/wp-admin/includes/template.php 2010-01-22 18:27:54 UTC (rev 12797)
</span><span class="lines">@@ -1265,7 +1265,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> <input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php echo esc_attr( $update_text ); ?>" />
</span><span class="cx"> <?php } ?>
</span><del>- <input type="hidden" name="post_view" value="<?php echo $m; ?>" />
</del><ins>+ <input type="hidden" name="post_view" value="<?php echo esc_attr($m); ?>" />
+ <input type="hidden" name="screen" value="<?php echo esc_attr($screen->id); ?>" />
</ins><span class="cx"> <br class="clear" />
</span><span class="cx"> </p>
</span><span class="cx"> </td></tr>
</span><span class="lines">@@ -3827,4 +3828,47 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Set the current screen object
+ *
+ * @since 3.0
+ *
+ * @uses $current_screen
+ *
+ * @param string $id Screen id, optional.
+ */
+function set_current_screen( $id = '' ) {
+ global $current_screen, $hook_suffix, $typenow;
+
+ if ( empty($id) ) {
+ $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);
+ } else {
+ if ( false !== strpos($id, '-') )
+ list( $id, $typenow ) = explode('-', $id, 2);
+ $current_screen = array('id' => $id, 'base' => $id);
+ }
+
+ $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);
+}
+
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>