Changeset 8620 for branches/crazyhorse/wp-includes/query.php

Timestamp:

08/11/2008 10:52:43 PM (17 years ago)

Author:

ryan

Message:

crazyhorse: merge with log:trunk@8334:8619 , merge arrows unresolved

File:

• branches/crazyhorse/wp-includes/query.php (modified) (10 diffs)

branches/crazyhorse/wp-includes/query.php

@@ -122 +122 @@
 function is_tax( $slug = '' ) {
     global $wp_query;
-    
+
     if ( !$wp_query->is_tax )
         return false;
@@ -215 +215 @@
     $page = (array) $page;
 
-    if ( in_array( $page_obj->ID, $page ) )
+    if ( in_array( $page_obj->ID, $page ) )
         return true;
     elseif ( in_array( $page_obj->post_title, $page ) )
@@ -473 +473 @@
             , 'category_name'
             , 'tag'
+            , 'cat'
             , 'tag_id'
             , 'author_name'
@@ -774 +775 @@
 
         if ( !empty($qv['post_status']) )
-            $qv['post_status'] = sanitize_user($qv['post_status'], true);
+            $qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
 
         if ( $this->is_posts_page && !$qv['withcomments'] )
@@ -831 +832 @@
         $groupby = '';
         $post_status_join = false;
+
+        if ( !isset($q['caller_get_posts']) )
+            $q['caller_get_posts'] = false;
 
         if ( !isset($q['post_type']) ) {
@@ -988 +992 @@
             $n = ($q['exact']) ? '' : '%';
             $searchand = '';
-            foreach((array)$q['search_terms'] as $term) {
+            foreach( (array) $q['search_terms'] as $term) {
                 $term = addslashes_gpc($term);
                 $search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))";
@@ -1013 +1017 @@
             $q['cat'] = '';
             $req_cats = array();
-            foreach ( $cat_array as $cat ) {
+            foreach ( (array) $cat_array as $cat ) {
                 $cat = intval($cat);
                 $req_cats[] = $cat;
@@ -1124 +1128 @@
             $include_tags = "'" . implode("', '", $q['tag_slug__in']) . "'";
             $whichcat .= " AND $wpdb->terms.slug IN ($include_tags) ";
-            $reqtag = is_term( $q['tag_slug__in'][0], 'post_tag' );
+            $reqtag = get_term_by( 'slug', $q['tag_slug__in'][0], 'post_tag' );
             if ( !empty($reqtag) )
-                $q['tag_id'] = $reqtag['term_id'];
+                $q['tag_id'] = $reqtag->term_id;
         }
 
@@ -1355 +1359 @@
         if ( ! empty($q['meta_key']) || ! empty($q['meta_value']) )
             $join .= " LEFT JOIN $wpdb->postmeta ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) ";
-        if ( ! empty($q['meta_key']) ) 
+        if ( ! empty($q['meta_key']) )
             $where .= $wpdb->prepare("AND $wpdb->postmeta.meta_key = %s ", $q['meta_key']);
         if ( ! empty($q['meta_value']) )
@@ -1495 +1499 @@
                     }
                 }
+            }
+        }
+
+        // Put sticky posts at the top of the posts array
+        $sticky_posts = get_option('sticky_posts');
+        if ( $this->is_home && $page <= 1 && !empty($sticky_posts) && !$q['caller_get_posts'] ) {
+            $num_posts = count($this->posts);
+            $sticky_offset = 0;
+            // Loop over posts and relocate stickies to the front.
+            for ( $i = 0; $i < $num_posts; $i++ ) {
+                if ( in_array($this->posts[$i]->ID, $sticky_posts) ) {
+                    $sticky_post = $this->posts[$i];
+                    // Remove sticky from current position
+                    array_splice($this->posts, $i, 1);
+                    // Move to front, after other stickies
+                    array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
+                    // Increment the sticky offset.  The next sticky will be placed at this offset.
+                    $sticky_offset++;
+                    // Remove post from sticky posts array
+                    $offset = array_search($sticky_post->ID, $sticky_posts);
+                    array_splice($sticky_posts, $offset, 1);
+                }
+            }
+
+            // Fetch sticky posts that weren't in the query results
+            $stickies__in = implode(',', array_map( 'absint', $sticky_posts ));
+            $stickies = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE $wpdb->posts.ID IN ($stickies__in)" );
+            // TODO Make sure post is published or viewable by the current user
+            foreach ( $stickies as $sticky_post ) {
+                if ( 'publish' != $sticky_post->post_status )
+                    continue;
+                array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
+                $sticky_offset++;
             }
         }