Changeset 4818

Timestamp:

03/21/2013 03:56:08 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Improve logic in topics loop, so that super-stickies are always above forum-stickies. Props alex-ye. Fixes #2260.

File:

• trunk/includes/topics/template-tags.php (modified) (5 diffs)

trunk/includes/topics/template-tags.php

@@ -162 +162 @@
         // Get super stickies and stickies in this forum
         $stickies = bbp_get_super_stickies();
-        $stickies = !empty( $r['post_parent'] ) ? array_merge( $stickies, bbp_get_stickies( $r['post_parent'] ) ) : $stickies;
+
+        // Get stickies for current forum
+        if ( !empty( $r['post_parent'] ) ) {
+            $stickies = array_merge( $stickies, bbp_get_stickies( $r['post_parent'] ) );
+        }
+
+        // Remove any duplicate stickies
         $stickies = array_unique( $stickies );
 
@@ -168 +174 @@
         if ( is_array( $stickies ) && !empty( $stickies ) ) {
 
-            // Setup the number of stickies and reset offset to 0
-            $num_topics    = count( $bbp->topic_query->posts );
-            $sticky_offset = 0;
+            // Start the offset at -1 so first sticky is at correct 0 offset
+            $sticky_offset = -1;
 
             // Loop over topics and relocate stickies to the front.
-            for ( $i = 0; $i < $num_topics; $i++ ) {
-                if ( in_array( $bbp->topic_query->posts[$i]->ID, $stickies ) ) {
-                    $sticky = $bbp->topic_query->posts[$i];
+            foreach ( $stickies as $sticky_index => $sticky_ID ) {
+
+                // Get the post offset from the posts array
+                $post_offsets = wp_filter_object_list( $bbp->topic_query->posts, array( 'ID' => $sticky_ID ), 'OR', 'ID' );
+
+                // Continue if no post offsets
+                if ( empty( $post_offsets ) ) {
+                    continue;
+                }
+
+                // Loop over posts in current query and splice them into position
+                foreach ( array_keys( $post_offsets ) as $post_offset ) {
+                    $sticky_offset++;
+
+                    $sticky = $bbp->topic_query->posts[$post_offset];
 
                     // Remove sticky from current position
-                    array_splice( $bbp->topic_query->posts, $i, 1 );
+                    array_splice( $bbp->topic_query->posts, $post_offset, 1 );
 
                     // Move to front, after other stickies
                     array_splice( $bbp->topic_query->posts, $sticky_offset, 0, array( $sticky ) );
 
-                    // 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->ID, $stickies );
-
                     // Cleanup
-                    unset( $stickies[$offset] );
-                    unset( $sticky            );
+                    unset( $stickies[$sticky_index] );
+                    unset( $sticky );
                 }
+
+                // Cleanup
+                unset( $post_offsets );
             }
+
+            // Cleanup
+            unset( $sticky_offset );
 
             // If any posts have been excluded specifically, Ignore those that are sticky.
@@ -213 +230 @@
                 );
 
+                // Cleanup
+                unset( $stickies );
+
                 // What are the default allowed statuses (based on user caps)
                 if ( bbp_get_view_all() ) {
@@ -229 +249 @@
                     $sticky_count = count( $sticky_posts );
 
-                    // Loop through stickies and add them to beginning of array
-                    foreach ( $sticky_posts as $sticky )
-                        $topics[] = $sticky;
-
-                    // Loop through topics and add them to end of array
-                    foreach ( $bbp->topic_query->posts as $topic )
-                        $topics[] = $topic;
+                    // Merge the stickies topics with the query topics .
+                    $bbp->topic_query->posts       = array_merge( $sticky_posts, $bbp->topic_query->posts );
 
                     // Adjust loop and counts for new sticky positions
-                    $bbp->topic_query->posts       = $topics;
                     $bbp->topic_query->found_posts = (int) $bbp->topic_query->found_posts + (int) $sticky_count;
                     $bbp->topic_query->post_count  = (int) $bbp->topic_query->post_count  + (int) $sticky_count;
 
                     // Cleanup
-                    unset( $topics       );
-                    unset( $stickies     );
                     unset( $sticky_posts );
                 }
@@ -2312 +2324 @@
      */
     function bbp_get_topic_edit_link( $args = '' ) {
-        
+
         // Parse arguments against default values
         $r = bbp_parse_args( $args, array(