Changeset 3655

Timestamp:

03/21/06 04:26:50 (3 years ago)

Author:

ryan

Message:

Add include param to get_posts(), get_categories(), get_pages(), and get_bookmarks(). Props MichaelH. fixes #2562

Files:

• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/template-functions-bookmarks.php (modified) (3 diffs)
• trunk/wp-includes/template-functions-category.php (modified) (2 diffs)
• trunk/wp-includes/template-functions-post.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -1447 +1447 @@
-function get_posts($args) {
-    global $wpdb;
+
+    if ( is_array($args) )
+        $r = &$args;
+    else
+        parse_str($args, $r);
-    parse_str($args, $r);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    $posts = $wpdb->get_results(
-        "SELECT DISTINCT * FROM $wpdb->posts " .
-r['category']
-"
-r['category'] ) ? "" : "AND $wpdb->posts.ID = $wpdb->post2cat.post_id AND $wpdb->post2cat.category_id = " . $r['category']
-r['orderby'] . " " . $r['order'] . " LIMIT " . $r['offset'] . ',' . $r['numberposts']
+category
+$exclusions $inclusions " 
+category ) ? "" : "AND $wpdb->posts.ID = $wpdb->post2cat.post_id AND $wpdb->post2cat.category_id = " . $category
+orderby . " " . $order . " LIMIT " . $offset . ',' . $numberposts
-
-    update_post_caches($posts);

trunk/wp-includes/template-functions-bookmarks.php

@@ -284 +284 @@
-
-    $defaults = array('orderby' => 'name', 'order' => 'ASC', 'limit' => -1, 'category' => -1,
-
+, 'include' => '', 'exclude' => ''
-    $r = array_merge($defaults, $r);
-    extract($r);
-
+    $inclusions = '';
+    if ( !empty($include) ) {
+    $exclude = '';  //ignore exclude, category, and category_name params if using include
+    $category = -1;
+    $category_name = '';
+        $inclinks = preg_split('/[\s,]+/',$include);
+        if ( count($inclinks) ) {
+            foreach ( $inclinks as $inclink ) {
+                if (empty($inclusions))
+                    $inclusions = ' AND ( link_id = ' . intval($inclink) . ' ';
+                else
+                    $inclusions .= ' OR link_id = ' . intval($inclink) . ' ';
+            }
+        }
+    }
+    if (!empty($inclusions)) 
+        $inclusions .= ')';
+
-    $exclusions = '';
-    if ( !empty($exclude) ) {
-r['exclude']
+exclude
-        if ( count($exlinks) ) {
-            foreach ( $exlinks as $exlink ) {
-
+
+
+
+
-            }
-        }
-    }
-
+
+
+
-    if ( ! empty($category_name) ) {
-        if ( $cat_id = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$category_name' LIMIT 1") )
@@ -321 +344 @@
-    }
-
-r['orderby']
+orderby
-    $length = '';
-    switch ($orderby) {
@@ -342 +365 @@
-
-    $query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
+    $query .= " $exclusions $inclusions";
-    $query .= " ORDER BY $orderby $order";
-    if ($limit != -1)

trunk/wp-includes/template-functions-category.php

@@ -377 +377 @@
-
-    $defaults = array('type' => 'post', 'child_of' => 0, 'orderby' => 'name', 'order' => 'ASC',
-
+, $exclude => '', $include => ''
-    $r = array_merge($defaults, $r);
-
+  // restricts order by to cat_ID and cat_name fields
-    extract($r);
-
-    $exclusions = '';
-    $having = '';
-    $where = 'cat_ID > 0';
+    $inclusions = '';
+    if ( !empty($include) ) {
+        $child_of = 0; //ignore child_of and exclude params if using include 
+        $exclude = '';  
+        $incategories = preg_split('/[\s,]+/',$include);
+        if ( count($incategories) ) {
+            foreach ( $incategories as $incat ) {
+                if (empty($inclusions))
+                    $inclusions = ' AND ( cat_ID = ' . intval($incat) . ' ';
+                else
+                    $inclusions .= ' OR cat_ID = ' . intval($incat) . ' ';
+            }
+        }
+    }
+    if (!empty($inclusions)) 
+        $inclusions .= ')'; 
+    $where .= $inclusions;
-
-    $exclusions = '';
@@ -391 +406 @@
-        if ( count($excategories) ) {
-            foreach ( $excategories as $excat ) {
-
-
+
+
+
+
+
-            }
-        }
-    }
+    if (!empty($exclusions)) 
+        $exclusions .= ')';
-    $exclusions = apply_filters('list_cats_exclusions', $exclusions );
-    $where .= $exclusions;
-
+    $having = '';
-    if ( $hide_empty ) {
-        if ( 'link' == $type )

trunk/wp-includes/template-functions-post.php

@@ -307 +307 @@
-
-    $defaults = array('child_of' => 0, 'sort_order' => 'ASC', 'sort_column' => 'post_title',
-
+, $exclude => '', $include => ''
-    $r = array_merge($defaults, $r);
+    extract($r);
+
+    $inclusions = '';
+    if ( !empty($include) ) {
+        $child_of = 0; //ignore child_of and exclude params if using include 
+        $exclude = '';  
+        $incpages = preg_split('/[\s,]+/',$include);
+        if ( count($incpages) ) {
+            foreach ( $incpages as $incpage ) {
+                if (empty($inclusions))
+                    $inclusions = ' AND ( ID = ' . intval($incpage) . ' ';
+                else
+                    $inclusions .= ' OR ID = ' . intval($incpage) . ' ';
+            }
+        }
+    }
+    if (!empty($inclusions)) 
+        $inclusions .= ')'; 
-
-    $exclusions = '';
-r['exclude']
-r['exclude']
+exclude
+exclude
-        if ( count($expages) ) {
-            foreach ( $expages as $expage ) {
-
+
+
+
+
-            }
-        }
-    }
+    if (!empty($exclusions)) 
+        $exclusions .= ')';
-
-    $pages = $wpdb->get_results("SELECT * " .
-        "FROM $wpdb->posts " .
-        "WHERE post_type = 'page' AND post_status = 'publish' " .
-
-r['sort_column'] . " " . $r['sort_order']
+$inclusions
+sort_column . " " . $sort_order
-
-    if ( empty($pages) )
@@ -332 +355 @@
-    update_page_cache($pages);
-
-r['child_of'] || $r['hierarchical']
-r['child_of']
+child_of || $hierarchical
+child_of
-
-    return $pages;