Changeset 997790

Timestamp:

09/27/2014 11:43:34 PM (11 years ago)

Author:

jakemgold

Message:

Fixed ordering in 4.0 due to core changes to ORDER BY in WP Query

Location:

simple-page-ordering/trunk

Files:

• readme.txt (modified) (2 diffs)
• simple-page-ordering.php (modified) (7 diffs)

simple-page-ordering/trunk/readme.txt

@@ -4 +4 @@
 Tags: order, re-order, ordering, pages, page, manage, menu_order, hierarchical, ajax, drag-and-drop, admin
 Requires at least: 3.8
-Tested up to: 3.9.2
-Stable tag: 2.2.2
+Tested up to: 4.0
+Stable tag: 2.2.3
 
 Order your pages and other hierarchical post types with simple drag and drop right from the standard page list.
@@ -77 +77 @@
 
 == Changelog ==
+
+= 2.2.3 =
+* Fixed ordering in WordPress 4.0 following core changes to ORDER BY in WP_Query
 
 = 2.2.2 =

simple-page-ordering/trunk/simple-page-ordering.php

@@ -4 +4 @@
 Plugin URI: http://10up.com/plugins/simple-page-ordering-wordpress/
 Description: Order your pages and hierarchical post types using drag and drop on the built in page list. For further instructions, open the "Help" tab on the Pages screen.
-Version: 2.2.2
+Version: 2.2.3
 Author: Jake Goldman, 10up
 Author URI: http://10up.com
@@ -81 +81 @@
      */
     public static function wp() {
-        if ( 0 === strpos( get_query_var('orderby'), 'menu_order' ) ) {
+        $orderby = get_query_var('orderby');
+        if ( ( is_string( $orderby ) && 0 === strpos( $orderby, 'menu_order' ) ) || ( isset( $orderby['menu_order'] ) && $orderby['menu_order'] == 'ASC' ) ) {
             $script_name = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? 'simple-page-ordering.dev.js' : 'simple-page-ordering.js';
             wp_enqueue_script( 'simple-page-ordering', plugins_url( $script_name, __FILE__ ), array('jquery-ui-sortable'), '2.1', true );
@@ -120 +121 @@
             error_reporting( 0 );
         }
+
+        global $wp_version;
 
         $previd = empty( $_POST['previd'] ) ? false : (int) $_POST['previd'];
@@ -157 +160 @@
         ));
 
-        $siblings = new WP_Query(array(
+        $siblings_query = array(
             'depth'                     => 1,
             'posts_per_page'            => $max_sortable_posts,
@@ -163 +166 @@
             'post_status'               => $post_stati,
             'post_parent'               => $parent_id,
-            'orderby'                   => 'menu_order title',
-            'order'                     => 'ASC',
+            'orderby'                   => array( 'menu_order' => 'ASC', 'title' => 'ASC' ),
             'post__not_in'              => $excluded,
             'update_post_term_cache'    => false,
@@ -170 +172 @@
             'suppress_filters'          => true,
             'ignore_sticky_posts'       => true,
-        )); // fetch all the siblings (relative ordering)
+        );
+        if ( version_compare( $wp_version, '4.0', '<' ) ) {
+            $siblings_query['orderby'] = 'menu_order title';
+            $siblings_query['order'] = 'ASC';
+        }
+        $siblings = new WP_Query( $siblings_query ); // fetch all the siblings (relative ordering)
 
         // don't waste overhead of revisions on a menu order change (especially since they can't *all* be rolled back at once)
@@ -275 +282 @@
     public static function sort_by_order_link( $views ) {
         $class = ( get_query_var('orderby') == 'menu_order title' ) ? 'current' : '';
-        $query_string = esc_url( remove_query_arg(array( 'orderby', 'order' )) );
-        $query_string = add_query_arg( 'orderby', urlencode('menu_order title'), $query_string );
+        $query_string = esc_url( remove_query_arg( array( 'orderby', 'order' ) ) );
+        if ( ! is_post_type_hierarchical( get_post_type() ) ) {
+            $query_string = add_query_arg( 'orderby', urlencode( 'menu_order title' ), $query_string );
+            $query_string = add_query_arg( 'order', 'asc', $query_string );
+        }
         $views['byorder'] = sprintf('<a href="%s" class="%s">%s</a>', $query_string, $class, __("Sort by Order", 'simple-page-ordering'));