Changeset 2502

Timestamp:

07/23/2010 04:03:35 AM (16 years ago)

Author:

chrishajer

Message:

Fix order of posts and remove duplicates, using a regex. Fixes #1301. Props Nightgunner5

Location:

trunk/bb-includes

Files:

• functions.bb-meta.php (modified) (1 diff)
• functions.bb-posts.php (modified) (2 diffs)

trunk/bb-includes/functions.bb-meta.php

@@ -297 +297 @@
                         break;
                 case 'version':
-                        return '1.1-alpha-2475'; // Don't filter
+                        return '1.1-alpha-2501'; // Don't filter
                         break;
                 case 'bb_db_version' :

trunk/bb-includes/functions.bb-posts.php

@@ -206 +206 @@
         $the_posts = array_merge( $_cached_posts, $_query_posts );
 
+        global $bb_cache_posts_sort_by;
+        $bb_cache_posts_sort_by = 'post_id';
+        if ( isset( $_query ) && preg_match( '/ORDER\s+BY\s+`?(?:p\.)?(.+?)(?:[`,\s]|$)/i', $_query, $order_by ) )
+                $bb_cache_posts_sort_by = $order_by[1];
         usort( $the_posts, '_bb_cache_posts_sort' );
-        if ( isset( $_query ) && strpos( $_query, 'DESC' ) !== false )
+        if ( isset( $_query ) && stripos( $_query, 'DESC' ) !== false )
                 $the_posts = array_reverse( $the_posts );
 
@@ -214 +218 @@
 
 function _bb_cache_posts_sort( $a, $b ) {
-        return (int) $a->post_id - (int) $b->post_id;
+        global $bb_cache_posts_sort_by;
+
+        if ( $a->$bb_cache_posts_sort_by > $b->$bb_cache_posts_sort_by )
+                return 1;
+        if ( $a->$bb_cache_posts_sort_by < $b->$bb_cache_posts_sort_by )
+                return -1;
+        return 0;
 }