From cbbc1d2a4532bde2b612a9757f828e0416e668e2 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 19 Mar 2006 22:25:43 +0000
Subject: [PATCH] - Bug 1104: fixed a typo ($necoding => $encoding) - Bug 1139:
 active_topics now has a button to submit the "Display posts from previous
 <time>" form - active_topics doesn't return NULL rows anymore - fix a padding
 bug in the search forum listing

git-svn-id: file:///svn/phpbb/trunk@5674 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_messenger.php             |  2 +-
 phpBB/search.php                                   | 14 +++++++++++---
 .../styles/subSilver/template/search_results.html  |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index a72fa33288..ec4b4a1fd0 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -14,7 +14,7 @@
 */
 class messenger
 {
-	var $vars, $msg, $extra_headers, $replyto, $from, $subject, $necoding;
+	var $vars, $msg, $extra_headers, $replyto, $from, $subject, $encoding;
 	var $addresses = array();
 
 	var $mail_priority = MAIL_NORMAL_PRIORITY;
diff --git a/phpBB/search.php b/phpBB/search.php
index 13d64a7230..034bd38572 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -263,9 +263,10 @@ if ($keywords || $author || $search_id)
 				$last_post_time = (time() - ($sort_days * 24 * 3600));
 
 				$sql = 'SELECT DISTINCT t.topic_id
-					FROM ' . POSTS_TABLE . ' p
-					LEFT JOIN ' . TOPICS_TABLE . " t ON (t.topic_approved = 1 AND p.topic_id = t.topic_id)
+					FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t
 					WHERE p.post_time > $last_post_time
+						AND t.topic_approved = 1
+						AND p.topic_id = t.topic_id
 						$m_approve_fid_sql
 						" . ((sizeof($ex_fid_ary)) ? ' AND p.forum_id NOT IN (' . implode(',', $ex_fid_ary) . ')' : '') . '
 					ORDER BY t.topic_last_post_time DESC';
@@ -736,7 +737,14 @@ while ($row = $db->sql_fetchrow($result))
 	}
 	else if ($row['left_id'] > $right + 1)
 	{
-		$padding = $pad_store[$row['parent_id']];
+		if (isset($pad_store[$row['parent_id']]))
+		{
+			$padding = $pad_store[$row['parent_id']];
+		}
+		else
+		{
+			continue;
+		}
 	}
 
 	$right = $row['right_id'];
diff --git a/phpBB/styles/subSilver/template/search_results.html b/phpBB/styles/subSilver/template/search_results.html
index fcd2fc3f31..c32aaad904 100644
--- a/phpBB/styles/subSilver/template/search_results.html
+++ b/phpBB/styles/subSilver/template/search_results.html
@@ -69,7 +69,7 @@
 	</tr>
 	<!-- END searchresults -->
 	<tr>
-		<td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY -->&nbsp;<span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /><!-- ENDIF --></td>
+		<td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY -->&nbsp;<span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- ENDIF -->&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
 	</tr>
 	</table>