Changeset 2440

Timestamp:

06/04/2010 09:10:20 PM (15 years ago)

Author:

chrishajer

Message:

Trying again to fix pagination in search. Fixes #1274. Props GautamGupta

Location:

trunk

Files:

• bb-includes/functions.bb-template.php (modified) (1 diff)
• bb-templates/kakumei/search.php (modified) (3 diffs)
• search.php (modified) (3 diffs)

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

@@ -1643 +1643 @@
 }
 
-function bb_search_pages() {
-    global $page, $search_count;
-    echo apply_filters( 'bb_search_pages', get_page_number_links( array( 'page' => $page, 'total' => $search_count, 'per_page' => 5, 'mod_rewrite' => false ) ) );
+function bb_search_pages( $args = null ) {
+    global $page, $search_count, $per_page;
+    
+    $defaults = array( 'before' => '', 'after' => '' );
+    $args = wp_parse_args( $args, $defaults );
+    
+    if ( $pages = apply_filters( 'bb_search_pages', get_page_number_links( array( 'page' => $page, 'total' => $search_count, 'per_page' => $per_page, 'mod_rewrite' => false ) ) ) )
+        echo $args['before'] . $pages . $args['after'];
 }
 

trunk/bb-templates/kakumei/search.php

@@ -15 +15 @@
         <li<?php alt_class( 'recent' ); ?>>
             <a class="result" href="<?php post_link(); ?>"><?php echo bb_show_topic_context( $q, get_topic_title( $bb_post->topic_id ) ); ?></a>
-            <span class="freshness"><?php printf( __( 'Posted by <a href="%1$s">%2$s</a> on %3$s'), get_user_profile_link( $bb_post->poster_id ), get_post_author(), bb_datetime_format_i18n( bb_get_post_time( array( 'format' => 'timestamp' ) ) ) ); ?></span>
+            <span class="freshness"><?php printf( __( 'By <a href="%1$s">%2$s</a> on %3$s'), get_user_profile_link( $bb_post->poster_id ), get_post_author(), bb_datetime_format_i18n( bb_get_post_time( array( 'format' => 'timestamp' ) ) ) ); ?></span>
             <p><?php echo bb_show_context( $q, $bb_post->post_text ); ?></p>
         </li>
@@ -28 +28 @@
     <ol>
 <?php foreach ( $relevant as $topic ) : ?>
+<?php $bb_post = bb_get_first_post( $topic ); ?>
         <li<?php alt_class( 'relevant' ); ?>>
-            <a class="result" href="<?php post_link( $topic->post_id ); ?>"><?php echo bb_show_topic_context( $q, get_topic_title() ); ?></a>
-            <span class="freshness"><?php printf( __( 'Posted by <a href="%1$s">%2$s</a> on %3$s' ), get_user_profile_link( $topic->topic_id ), get_topic_author(), bb_datetime_format_i18n( get_topic_start_time( array( 'format' => 'timestamp' ) ) ) ); ?></span>
-            <p><?php echo bb_show_context( $q, $topic->post_text ); ?></p>
+            <a class="result" href="<?php post_link(); ?>"><?php echo bb_show_topic_context( $q, get_topic_title() ); ?></a>
+            <span class="freshness"><?php printf( __( 'By <a href="%1$s">%2$s</a> on %3$s' ), get_user_profile_link( $topic->topic_poster ), get_topic_author(), bb_datetime_format_i18n( get_topic_start_time( array( 'format' => 'timestamp' ) ) ) ); ?></span>
+            <p><?php echo bb_show_context( $q, $bb_post->post_text ); ?></p>
         </li>
 <?php endforeach; ?>
@@ -38 +39 @@
 <?php endif; ?>
 
+<?php bb_search_pages( array( 'before' => '<div class="nav">', 'after' => '</div>' ) ); ?> 
+
 <?php if ( $q && !$recent && !$relevant ) : ?>
 <p><?php printf( __( 'Your search %s did not return any results. Here are some suggestions:' ), '&#8220;<em>' . esc_html( $q ) . '</em>&#8221;' ); ?></p>
 <ul id="search-suggestions">
-    <li><?php _e( 'Make sure all words are spelled correctly' ); ?></li>
-    <li><?php _e( 'Try different keywords' ); ?></li>
-    <li><?php _e( 'Try more general keywords' ); ?></li>
+    <li><?php _e( 'Make sure all words are spelled correctly' ); ?></li>
+    <li><?php _e( 'Try different keywords' ); ?></li>
+    <li><?php _e( 'Try more general keywords' ); ?></li>
 </ul>
-<?php else: ?>
-    <?php bb_search_pages(); ?>
-    <br />
 <?php endif; ?>
 

trunk/search.php

@@ -11 +11 @@
     global $page;
     if ( !$page ) $page = 1;
-    $search_start = 5 * ( $page - 1);
-    $search_stop = 5;
+    $per_page = ceil( (int) bb_get_option( 'page_topics' ) / 2 );
+    $search_start = $per_page * ( $page - 1 );
+    $search_stop = $per_page;
     
     /* Recent */
     add_filter( 'bb_recent_search_fields',   create_function( '$f', 'return $f . ", MAX(post_time) AS post_time";' ) );
     add_filter( 'bb_recent_search_group_by', create_function( '', 'return "t.topic_id";' ) );
-    $bb_query_form->BB_Query_Form( 'post', array(), array( 'order_by' => 'p.post_time', 'page' => 1, 'post_status' => 0, 'topic_status' => 0, 'post_text' => $q, 'forum_id', 'tag', 'topic_author', 'post_author' ), 'bb_recent_search' );
+    $bb_query_form->BB_Query_Form( 'post', array(), array( 'order_by' => 'p.post_time', 'page' => 1, 'per_page' => -1, 'post_status' => 0, 'topic_status' => 0, 'post_text' => $q, 'forum_id', 'tag', 'topic_author', 'post_author' ), 'bb_recent_search' );
     $recent = $bb_query_form->results;
     if ( $recent ) {
@@ -27 +28 @@
     
     /* Relevant */
-    $bb_query_form->BB_Query_Form( 'topic', array( 'search' => $q ), array( 'page' => 1, 'post_status' => 0, 'topic_status' => 0, 'search', 'forum_id', 'tag', 'topic_author', 'post_author' ), 'bb_relevant_search' );
+    $bb_query_form->BB_Query_Form( 'topic', array( 'search' => $q ), array( 'page' => 1, 'post_status' => 0, 'per_page' => -1, 'topic_status' => 0, 'search', 'forum_id', 'tag', 'topic_author', 'post_author' ), 'bb_relevant_search' );
     $relevant = $bb_query_form->results;
-    if ( $recent ) {
+    if ( $relevant ) {
         $relevant_count = isset( $bb_query_form->count ) ? $bb_query_form->count : count( $relevant );
         $relevant = array_slice( $relevant, $search_start, $search_stop );
@@ -55 +56 @@
 endif;
 
-bb_load_template( 'search.php', array( 'q', 'recent', 'relevant', 'page', 'search_count' ), $q );
+bb_load_template( 'search.php', array( 'q', 'recent', 'relevant', 'page', 'per_page', 'search_count' ), $q );
 
 ?>