Ticket #1274: 2436-fixes.diff

bb-templates/kakumei/search.php

@@ -14 +14 @@
 <?php foreach ( $recent as $bb_post ) : ?>
                 <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>
 <?php endforeach; ?>
@@ -27 +27 @@
         <h4><?php _e( 'Relevant Topics' )?></h4>
         <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; ?>
         </ol>

search.php

@@ -28 +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' );
         $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 );
         } else {