Changeset 25168 for trunk/src/wp-includes/post.php

Timestamp:

08/29/2013 06:48:29 PM (12 years ago)

Author:

wonderboymusic

Message:

Improve the include / exclude SQL generation in get_pages() by using IN and NOT IN where applicable. Adds unit tests for include / exclude.

Fixes #22074.

File:

• trunk/src/wp-includes/post.php (modified) (2 diffs)

trunk/src/wp-includes/post.php

@@ -3672 +3672 @@
 
     $inclusions = '';
-    if ( !empty($include) ) {
+    if ( ! empty( $include ) ) {
         $child_of = 0; //ignore child_of, parent, exclude, meta_key, and meta_value params if using include
         $parent = -1;
@@ -3680 +3680 @@
         $hierarchical = false;
         $incpages = wp_parse_id_list( $include );
-        if ( ! empty( $incpages ) ) {
-            foreach ( $incpages as $incpage ) {
-                if (empty($inclusions))
-                    $inclusions = $wpdb->prepare(' AND ( ID = %d ', $incpage);
-                else
-                    $inclusions .= $wpdb->prepare(' OR ID = %d ', $incpage);
-            }
-        }
-    }
-    if (!empty($inclusions))
-        $inclusions .= ')';
+        if ( ! empty( $incpages ) )
+            $inclusions = ' AND ID IN (' . implode( ',', array_map( 'intval', $incpages ) ) .  ')';
+    }
 
     $exclusions = '';
-    if ( !empty($exclude) ) {
+    if ( ! empty( $exclude ) ) {
         $expages = wp_parse_id_list( $exclude );
-        if ( ! empty( $expages ) ) {
-            foreach ( $expages as $expage ) {
-                if (empty($exclusions))
-                    $exclusions = $wpdb->prepare(' AND ( ID <> %d ', $expage);
-                else
-                    $exclusions .= $wpdb->prepare(' AND ID <> %d ', $expage);
-            }
-        }
-    }
-    if (!empty($exclusions))
-        $exclusions .= ')';
+        if ( ! empty( $expages ) )
+            $exclusions = ' AND ID NOT IN (' . implode( ',', array_map( 'intval', $expages ) ) .  ')';
+    }
 
     $author_query = '';