<!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>[15253] trunk/wp-admin/includes/template.php:
Differentiate between edit and new via an action field for the screen.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15253">15253</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-06-14 19:33:04 +0000 (Mon, 14 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Differentiate between edit and new via an action field for the screen. Fix favorite_actions(). fixes <a href="http://trac.wordpress.org/ticket/13876">#13876</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (15252 => 15253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-06-14 18:08:32 UTC (rev 15252)
+++ trunk/wp-admin/includes/template.php 2010-06-14 19:33:04 UTC (rev 15253)
</span><span class="lines">@@ -3316,22 +3316,17 @@
</span><span class="cx"> * @since unknown
</span><span class="cx"> */
</span><span class="cx"> function favorite_actions( $screen = null ) {
</span><del>- global $post_type_object;
-
</del><span class="cx"> $default_action = false;
</span><span class="cx">
</span><span class="cx"> if ( is_string($screen) )
</span><span class="cx"> $screen = convert_to_screen($screen);
</span><span class="cx">
</span><del>- if ( isset($post_type_object) ) {
- switch ( $screen->id ) {
- case $post_type_object->name:
- $default_action = array('edit.php?post_type=' . $post_type_object->name => array($post_type_object->labels->edit_item, $post_type_object->cap->edit_posts));
- break;
- case "edit-{$post_type_object->name}":
- $default_action = array('post-new.php?post_type=' . $post_type_object->name => array($post_type_object->labels->new_item, $post_type_object->cap->edit_posts));
- break;
- }
</del><ins>+ if ( isset($screen->post_type) ) {
+ $post_type_object = get_post_type_object($screen->post_type);
+ if ( 'add' != $screen->action )
+ $default_action = array('post-new.php?post_type=' . $post_type_object->name => array($post_type_object->labels->new_item, $post_type_object->cap->edit_posts));
+ else
+ $default_action = array('edit.php?post_type=' . $post_type_object->name => array($post_type_object->labels->name, $post_type_object->cap->edit_posts));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !$default_action ) {
</span><span class="lines">@@ -3343,11 +3338,12 @@
</span><span class="cx"> $default_action = array('upload.php' => array(__('Edit Media'), 'upload_files'));
</span><span class="cx"> break;
</span><span class="cx"> case 'link-manager':
</span><del>- $default_action = array('link-add.php' => array(__('New Link'), 'manage_links'));
</del><ins>+ case 'link':
+ if ( 'add' != $screen->action )
+ $default_action = array('link-add.php' => array(__('New Link'), 'manage_links'));
+ else
+ $default_action = array('link-manager.php' => array(__('Edit Links'), 'manage_links'));
</ins><span class="cx"> break;
</span><del>- case 'link-add':
- $default_action = array('link-manager.php' => array(__('Edit Links'), 'manage_links'));
- break;
</del><span class="cx"> case 'users':
</span><span class="cx"> $default_action = array('user-new.php' => array(__('New User'), 'create_users'));
</span><span class="cx"> break;
</span><span class="lines">@@ -3902,9 +3898,13 @@
</span><span class="cx"> function set_current_screen( $id = '' ) {
</span><span class="cx"> global $current_screen, $hook_suffix, $typenow, $taxnow;
</span><span class="cx">
</span><ins>+ $action = '';
+
</ins><span class="cx"> if ( empty($id) ) {
</span><span class="cx"> $current_screen = $hook_suffix;
</span><span class="cx"> $current_screen = str_replace('.php', '', $current_screen);
</span><ins>+ if ( preg_match('/-add|-new$/', $current_screen) )
+ $action = 'add';
</ins><span class="cx"> $current_screen = str_replace('-new', '', $current_screen);
</span><span class="cx"> $current_screen = str_replace('-add', '', $current_screen);
</span><span class="cx"> $current_screen = array('id' => $current_screen, 'base' => $current_screen);
</span><span class="lines">@@ -3923,6 +3923,8 @@
</span><span class="cx">
</span><span class="cx"> $current_screen = (object) $current_screen;
</span><span class="cx">
</span><ins>+ $current_screen->action = $action;
+
</ins><span class="cx"> // Map index to dashboard
</span><span class="cx"> if ( 'index' == $current_screen->base )
</span><span class="cx"> $current_screen->base = 'dashboard';
</span></span></pre>
</div>
</div>
</body>
</html>