<!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>[12972] trunk/wp-admin: Fix delete media nonces.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12972">12972</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-05 17:59:18 +0000 (Fri, 05 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix delete media nonces. Props nacin. fixes <a href="http://trac.wordpress.org/ticket/12085">#12085</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditattachmentrowsphp">trunk/wp-admin/edit-attachment-rows.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditattachmentrowsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-attachment-rows.php (12971 => 12972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-attachment-rows.php        2010-02-05 17:54:40 UTC (rev 12971)
+++ trunk/wp-admin/edit-attachment-rows.php        2010-02-05 17:59:18 UTC (rev 12972)
</span><span class="lines">@@ -93,12 +93,12 @@
</span><span class="cx">                         $actions['edit'] = '&lt;a href=&quot;' . get_edit_post_link($post-&gt;ID, true) . '&quot;&gt;' . __('Edit') . '&lt;/a&gt;';
</span><span class="cx">                 if ( current_user_can('delete_post', $post-&gt;ID) ) {
</span><span class="cx">                         if ( $is_trash )
</span><del>-                                $actions['untrash'] = &quot;&lt;a class='submitdelete' href='&quot; . wp_nonce_url(&quot;post.php?action=untrash&amp;amp;post=$post-&gt;ID&quot;, 'untrash-post_' . $post-&gt;ID) . &quot;'&gt;&quot; . __('Restore') . &quot;&lt;/a&gt;&quot;;
</del><ins>+                                $actions['untrash'] = &quot;&lt;a class='submitdelete' href='&quot; . wp_nonce_url(&quot;post.php?action=untrash&amp;amp;post=$post-&gt;ID&quot;, 'untrash-attachment_' . $post-&gt;ID) . &quot;'&gt;&quot; . __('Restore') . &quot;&lt;/a&gt;&quot;;
</ins><span class="cx">                         elseif ( EMPTY_TRASH_DAYS &amp;&amp; MEDIA_TRASH )
</span><del>-                                $actions['trash'] = &quot;&lt;a class='submitdelete' href='&quot; . wp_nonce_url(&quot;post.php?action=trash&amp;amp;post=$post-&gt;ID&quot;, 'trash-post_' . $post-&gt;ID) . &quot;'&gt;&quot; . __('Trash') . &quot;&lt;/a&gt;&quot;;
</del><ins>+                                $actions['trash'] = &quot;&lt;a class='submitdelete' href='&quot; . wp_nonce_url(&quot;post.php?action=trash&amp;amp;post=$post-&gt;ID&quot;, 'trash-attachment_' . $post-&gt;ID) . &quot;'&gt;&quot; . __('Trash') . &quot;&lt;/a&gt;&quot;;
</ins><span class="cx">                         if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
</span><span class="cx">                                 $delete_ays = (!$is_trash &amp;&amp; !MEDIA_TRASH) ? &quot; onclick='return showNotice.warn();'&quot; : '';
</span><del>-                                $actions['delete'] = &quot;&lt;a class='submitdelete'$delete_ays href='&quot; . wp_nonce_url(&quot;post.php?action=delete&amp;amp;post=$post-&gt;ID&quot;, 'delete-post_' . $post-&gt;ID) . &quot;'&gt;&quot; . __('Delete Permanently') . &quot;&lt;/a&gt;&quot;;
</del><ins>+                                $actions['delete'] = &quot;&lt;a class='submitdelete'$delete_ays href='&quot; . wp_nonce_url(&quot;post.php?action=delete&amp;amp;post=$post-&gt;ID&quot;, 'delete-attachment_' . $post-&gt;ID) . &quot;'&gt;&quot; . __('Delete Permanently') . &quot;&lt;/a&gt;&quot;;
</ins><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx">                 if ( !$is_trash ) {
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (12971 => 12972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php        2010-02-05 17:54:40 UTC (rev 12971)
+++ trunk/wp-admin/includes/media.php        2010-02-05 17:59:18 UTC (rev 12972)
</span><span class="lines">@@ -1258,16 +1258,16 @@
</span><span class="cx">                 $send = &quot;&lt;input type='submit' class='button' name='send[$attachment_id]' value='&quot; . esc_attr__( 'Insert into Post' ) . &quot;' /&gt;&quot;;
</span><span class="cx">         if ( $delete &amp;&amp; current_user_can( 'delete_post', $attachment_id ) ) {
</span><span class="cx">                 if ( !EMPTY_TRASH_DAYS ) {
</span><del>-                        $delete = &quot;&lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=delete&amp;amp;post=$attachment_id&quot;, 'delete-post_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='delete'&gt;&quot; . __( 'Delete Permanently' ) . '&lt;/a&gt;';
</del><ins>+                        $delete = &quot;&lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=delete&amp;amp;post=$attachment_id&quot;, 'delete-attachment_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='delete'&gt;&quot; . __( 'Delete Permanently' ) . '&lt;/a&gt;';
</ins><span class="cx">                 } elseif ( !MEDIA_TRASH ) {
</span><span class="cx">                         $delete = &quot;&lt;a href='#' class='del-link' onclick=\&quot;document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\&quot;&gt;&quot; . __( 'Delete' ) . &quot;&lt;/a&gt;
</span><span class="cx">                          &lt;div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'&gt;&quot; . sprintf( __( 'You are about to delete &lt;strong&gt;%s&lt;/strong&gt;.' ), $filename ) . &quot;
</span><del>-                         &lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=delete&amp;amp;post=$attachment_id&quot;, 'delete-post_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='button'&gt;&quot; . __( 'Continue' ) . &quot;&lt;/a&gt;
</del><ins>+                         &lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=delete&amp;amp;post=$attachment_id&quot;, 'delete-attachment_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='button'&gt;&quot; . __( 'Continue' ) . &quot;&lt;/a&gt;
</ins><span class="cx">                          &lt;a href='#' class='button' onclick=\&quot;this.parentNode.style.display='none';return false;\&quot;&gt;&quot; . __( 'Cancel' ) . &quot;&lt;/a&gt;
</span><span class="cx">                          &lt;/div&gt;&quot;;
</span><span class="cx">                 } else {
</span><del>-                        $delete = &quot;&lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=trash&amp;amp;post=$attachment_id&quot;, 'trash-post_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='delete'&gt;&quot; . __( 'Move to Trash' ) . &quot;&lt;/a&gt;
-                        &lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=untrash&amp;amp;post=$attachment_id&quot;, 'untrash-post_' . $attachment_id ) . &quot;' id='undo[$attachment_id]' class='undo hidden'&gt;&quot; . __( 'Undo' ) . &quot;&lt;/a&gt;&quot;;
</del><ins>+                        $delete = &quot;&lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=trash&amp;amp;post=$attachment_id&quot;, 'trash-attachment_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='delete'&gt;&quot; . __( 'Move to Trash' ) . &quot;&lt;/a&gt;
+                        &lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=untrash&amp;amp;post=$attachment_id&quot;, 'untrash-attachment_' . $attachment_id ) . &quot;' id='undo[$attachment_id]' class='undo hidden'&gt;&quot; . __( 'Undo' ) . &quot;&lt;/a&gt;&quot;;
</ins><span class="cx">                 }
</span><span class="cx">         } else {
</span><span class="cx">                 $delete = '';
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (12971 => 12972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php        2010-02-05 17:54:40 UTC (rev 12971)
+++ trunk/wp-admin/upload.php        2010-02-05 17:59:18 UTC (rev 12972)
</span><span class="lines">@@ -388,10 +388,10 @@
</span><span class="cx">                         $actions['edit'] = '&lt;a href=&quot;' . get_edit_post_link($post-&gt;ID, true) . '&quot;&gt;' . __('Edit') . '&lt;/a&gt;';
</span><span class="cx">                 if ( current_user_can('delete_post', $post-&gt;ID) )
</span><span class="cx">                         if ( EMPTY_TRASH_DAYS &amp;&amp; MEDIA_TRASH ) {
</span><del>-                                $actions['trash'] = &quot;&lt;a class='submitdelete' href='&quot; . wp_nonce_url(&quot;post.php?action=trash&amp;amp;post=$post-&gt;ID&quot;, 'trash-post_' . $post-&gt;ID) . &quot;'&gt;&quot; . __('Trash') . &quot;&lt;/a&gt;&quot;;
</del><ins>+                                $actions['trash'] = &quot;&lt;a class='submitdelete' href='&quot; . wp_nonce_url(&quot;post.php?action=trash&amp;amp;post=$post-&gt;ID&quot;, 'trash-attachment_' . $post-&gt;ID) . &quot;'&gt;&quot; . __('Trash') . &quot;&lt;/a&gt;&quot;;
</ins><span class="cx">                         } else {
</span><span class="cx">                                 $delete_ays = !MEDIA_TRASH ? &quot; onclick='return showNotice.warn();'&quot; : '';
</span><del>-                                $actions['delete'] = &quot;&lt;a class='submitdelete'$delete_ays href='&quot; . wp_nonce_url(&quot;post.php?action=delete&amp;amp;post=$post-&gt;ID&quot;, 'delete-post_' . $post-&gt;ID) . &quot;'&gt;&quot; . __('Delete Permanently') . &quot;&lt;/a&gt;&quot;;
</del><ins>+                                $actions['delete'] = &quot;&lt;a class='submitdelete'$delete_ays href='&quot; . wp_nonce_url(&quot;post.php?action=delete&amp;amp;post=$post-&gt;ID&quot;, 'delete-attachment_' . $post-&gt;ID) . &quot;'&gt;&quot; . __('Delete Permanently') . &quot;&lt;/a&gt;&quot;;
</ins><span class="cx">                         }
</span><span class="cx">                 $actions['view'] = '&lt;a href=&quot;' . get_permalink($post-&gt;ID) . '&quot; title=&quot;' . esc_attr(sprintf(__('View &amp;#8220;%s&amp;#8221;'), $title)) . '&quot; rel=&quot;permalink&quot;&gt;' . __('View') . '&lt;/a&gt;';
</span><span class="cx">                 if ( current_user_can('edit_post', $post-&gt;ID) )
</span></span></pre>
</div>
</div>

</body>
</html>