Changeset 9607

Timestamp:

11/11/2008 11:34:08 AM (18 years ago)

Author:

azaozz

Message:

Add check for bulk-edit when deleting posts/pages, see #8135

Location:

trunk/wp-admin

Files:

• css/colors-fresh.css (modified) (3 diffs)
• edit-pages.php (modified) (4 diffs)
• edit.php (modified) (3 diffs)
• includes/template.php (modified) (1 diff)
• js/inline-edit-post.js (modified) (2 diffs)

trunk/wp-admin/css/colors-fresh.css

@@ -279 +279 @@
 }
 
-.button-secondary {
-        border-color: #CFE1EF;
-        color: #464646;
-        text-shadow: #FFF, 0 1px 0;
-}
-
 .button,
 .submit input,
@@ -291 +285 @@
 }
 
-.button-primary {
+.button-secondary,
+.submit .button-secondary {
+        border-color: #CFE1EF;
+        color: #464646;
+        text-shadow: #FFF, 0 1px 0;
+}
+
+.button-primary,
+.submit .button-primary {
         border-color: #21759B;
         color: #FFF;
@@ -300 +302 @@
 .button:disabled {
         background-color: #999;
+        background-image: none;
 }
 

trunk/wp-admin/edit-pages.php

@@ -16 +16 @@
         switch ( $doaction ) {
                 case 'delete':
-                        if ( isset($_GET['post']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) {
+                        if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) {
                                 check_admin_referer('bulk-pages');
                                 foreach( (array) $_GET['post'] as $post_id_del ) {
@@ -35 +35 @@
                         break;
                 case 'edit':
-                        if ( isset($_GET['post']) ) {
+                        if ( isset($_GET['post']) && isset($_GET['bulk_edit']) ) {
                                 check_admin_referer('bulk-pages');
 
@@ -49 +49 @@
                         break;
         }
+
         $sendback = wp_get_referer();
         if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page-new.php');
@@ -121 +122 @@
         printf( __ngettext( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) );
         unset($_GET['locked']);
-} ?>
+}
+$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated'), $_SERVER['REQUEST_URI'] );
+?>
 </p></div>
 <?php } ?>

trunk/wp-admin/edit.php

@@ -16 +16 @@
         switch ( $doaction ) {
                 case 'delete':
-                        if ( isset($_GET['post']) &&  (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) {
+                        if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) {
                                 check_admin_referer('bulk-posts');
                                 foreach( (array) $_GET['post'] as $post_id_del ) {
@@ -35 +35 @@
                         break;
                 case 'edit':
-                        if ( isset($_GET['post']) ) {
+                        if ( isset($_GET['post']) && isset($_GET['bulk_edit']) ) {
                                 check_admin_referer('bulk-posts');
 
@@ -115 +115 @@
         printf( __ngettext( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
         unset($_GET['locked']);
-} ?>
+} 
+$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated'), $_SERVER['REQUEST_URI'] );
+?>
 </p></div>
 <?php } ?>

trunk/wp-admin/includes/template.php

@@ -1122 +1122 @@
         <p class="submit inline-edit-save">
                 <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel alignleft"><?php _e('Cancel'); ?></a>
-                <a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="button-primary save alignright"><?php _e('Save'); ?></a>
                 <?php if ( ! $bulk ) {
                         wp_nonce_field( 'inlineeditnonce', '_inline_edit', false ); ?>
+                        <a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="button-primary save alignright"><?php _e('Save'); ?></a>
                         <img class="waiting" style="display:none;" src="images/loading.gif" alt="" />
+                <?php } else { ?>
+                        <input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php _e('Save'); ?>" />
                 <?php } ?>
                 <input type="hidden" name="post_view" value="<?php echo $m; ?>" />

trunk/wp-admin/js/inline-edit-post.js

@@ -24 +24 @@
 
                 $('a.cancel', bulkRow).click(function() { return inlineEditPost.revert(); });
-                $('a.save', bulkRow).click(function() { return inlineEditPost.saveBulk(); });
 
                 // add events
@@ -228 +227 @@
         },
 
-        saveBulk : function() {
-                $('form#posts-filter').submit();
-        },
-
         revert : function() {
                 var id;