diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-07-07 18:43:52 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-07-07 18:43:52 +0000 |
| commit | c6227ad5b0904c2c61737c8267f71fbc9f543a3b (patch) | |
| tree | 816b1d766d2bc1c3dc15b6071c19895f379830c7 /phpBB/search.php | |
| parent | a5c23243c7a0a86ccd749b7733b11d30a6c349e1 (diff) | |
| download | forums-c6227ad5b0904c2c61737c8267f71fbc9f543a3b.tar forums-c6227ad5b0904c2c61737c8267f71fbc9f543a3b.tar.gz forums-c6227ad5b0904c2c61737c8267f71fbc9f543a3b.tar.bz2 forums-c6227ad5b0904c2c61737c8267f71fbc9f543a3b.tar.xz forums-c6227ad5b0904c2c61737c8267f71fbc9f543a3b.zip | |
- fixed a parse error (oops)
- pass forum_ids to search indexing functions
- fixed a bug in fulltext_native's cache destroying
git-svn-id: file:///svn/phpbb/trunk@6152 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index d167fc42cd..4bdf03a386 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -141,7 +141,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) else if ($auth->acl_getf_global('m_approve')) { $m_approve_fid_ary = array_diff(array_keys($auth->acl_getf('!m_approve', true)), $ex_fid_ary); - $m_approve_fid_sql = ' AND (p.post_approved = 1' . (($m_approve_fid_ary) ? ' OR p.forum_id NOT IN (' . implode(', ', $m_approve_fid_ary) . ')') . ')' : ''; + $m_approve_fid_sql = ' AND (p.post_approved = 1' . (($m_approve_fid_ary) ? ' OR p.forum_id NOT IN (' . implode(', ', $m_approve_fid_ary) . ')' : '') . ')'; } else { @@ -540,6 +540,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) $result = $db->sql_query($sql); $result_topic_id = 0; + $rowset = array(); + if ($show_results == 'topics') { $forums = $rowset = array(); |