Changeset 12593

Timestamp:

12/31/2009 10:22:44 AM (15 years ago)

Author:

azaozz

Message:

Add AYS popup when deleting media, fixes #11673 for 2.9

Location:

branches/2.9/wp-admin

Files:

• edit-attachment-rows.php (modified) (1 diff)
• upload.php (modified) (1 diff)

branches/2.9/wp-admin/edit-attachment-rows.php

@@ -97 +97 @@
             elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
                 $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID) . "'>" . __('Trash') . "</a>";
-            if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH )
-                $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";
+            if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
+                $delete_ays = (!$is_trash && !MEDIA_TRASH) ? " onclick='return showNotice.warn();'" : '';
+                $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";
+            }
         }
         if ( !$is_trash )

branches/2.9/wp-admin/upload.php

@@ -393 +393 @@
             $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
         if ( current_user_can('delete_post', $post->ID) )
-            if ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
+            if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
                 $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID) . "'>" . __('Trash') . "</a>";
-            else
-                $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";
+            } else {
+                $delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
+                $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";
+            }
         $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
         if ( current_user_can('edit_post', $post->ID) )