<!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>[12272] trunk/wp-admin/includes/meta-boxes.php:
  Check action type to avoid warnings.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12272">12272</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-11-24 16:46:23 +0000 (Tue, 24 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Check action type to avoid warnings. Props sirzooro. fixes <a href="http://trac.wordpress.org/ticket/11203">#11203</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (12271 => 12272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php        2009-11-24 16:08:13 UTC (rev 12271)
+++ trunk/wp-admin/includes/meta-boxes.php        2009-11-24 16:46:23 UTC (rev 12272)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> &lt;?php do_action('post_submitbox_start'); ?&gt;
</span><span class="cx"> &lt;div id=&quot;delete-action&quot;&gt;
</span><span class="cx"> &lt;?php
</span><del>-if ( current_user_can(&quot;delete_${post_type}&quot;, $post-&gt;ID) ) {
</del><ins>+if ( ( 'edit' == $action ) &amp;&amp; current_user_can(&quot;delete_${post_type}&quot;, $post-&gt;ID) ) {
</ins><span class="cx">         if ( !EMPTY_TRASH_DAYS ) {
</span><span class="cx">                 $delete_url = wp_nonce_url( add_query_arg( array('action' =&gt; 'delete', 'post' =&gt; $post-&gt;ID) ), &quot;delete-${post_type}_{$post-&gt;ID}&quot; );
</span><span class="cx">                 $delete_text = __('Delete Permanently');
</span></span></pre>
</div>
</div>

</body>
</html>