Ticket #13152: metaboxorder.diff

wp-admin/admin-ajax.php

@@ -1098 +1098 @@
 
         exit;
         break;
-case 'meta-box-order':
-        check_ajax_referer( 'meta-box-order' );
+case 'metaboxorder':
+        check_ajax_referer( 'metaboxorder' );
         $order = isset( $_POST['order'] ) ? (array) $_POST['order'] : false;
         $page_columns = isset( $_POST['page_columns'] ) ? (int) $_POST['page_columns'] : 0;
         $page = isset( $_POST['page'] ) ? $_POST['page'] : '';
@@ -1111 +1111 @@
                 die('-1');
 
         if ( $order )
-                update_user_option($user->ID, "meta-box-order_$page", $order, true);
+                update_user_option($user->ID, "metaboxorder_$page", $order, true);
 
         if ( $page_columns )
                 update_user_option($user->ID, "screen_layout_$page", $page_columns, true);

wp-admin/includes/dashboard.php

@@ -193 +193 @@
         <p>
 <?php
         wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-        wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
+        wp_nonce_field( 'metaboxorder', 'metaboxorder-nonce', false );
 ?>
         </p>
 </form>

wp-admin/includes/template.php

@@ -2858 +2858 @@
         $i = 0;
         do {
                 // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
-                if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
+                if ( !$already_sorted && $sorted = get_user_option( "metaboxorder_$page" ) ) {
                         foreach ( $sorted as $box_context => $ids )
                                 foreach ( explode(',', $ids) as $id )
                                         if ( $id )

wp-admin/js/postbox.dev.js

@@ -132 +132 @@
                         var postVars, page_columns = $('.columns-prefs input:checked').val() || 0;
 
                         postVars = {
-                                action: 'meta-box-order',
-                                _ajax_nonce: $('#meta-box-order-nonce').val(),
+                                action: 'metaboxorder',
+                                _ajax_nonce: $('#metaboxorder-nonce').val(),
                                 page_columns: page_columns,
                                 page: page
                         }

wp-admin/edit-link-form.php

@@ -58 +58 @@
 
 wp_nonce_field( $nonce_action );
 wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+wp_nonce_field( 'metaboxorder', 'metaboxorder-nonce', false ); ?>
 
 <div id="poststuff" class="metabox-holder<?php echo 2 == $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
 

wp-admin/edit-form-advanced.php

@@ -193 +193 @@
 echo $form_extra;
 
 wp_nonce_field( 'autosave', 'autosavenonce', false );
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
+wp_nonce_field( 'metaboxorder', 'metaboxorder-nonce', false );
 wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
 ?>
 

wp-admin/nav-menus.php

@@ -405 +405 @@
                                                 </div><!--END #major-publishing-actions-->
                                         </div><!--END #submitpost .submitbox-->
                                         <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
-                                        <?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+                                        <?php wp_nonce_field( 'metaboxorder', 'metaboxorder-nonce', false ); ?>
                                         <?php wp_nonce_field( 'update-nav_menu', 'update-nav-menu-nonce' ); ?>
                                         <input type="hidden" name="action" value="update" />
                                         <input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />