aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/search.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-09-17 01:07:38 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-09-17 01:07:38 +0000
commitb12b1f8d6460e83a4b7cab2fc810c42a509e0968 (patch)
tree8ebdebc1025238472c2851aa36f092fa0dd59cce /phpBB/search.php
parent2c15e806b43a43125a02d4f39a2f8977b3c1a172 (diff)
downloadforums-b12b1f8d6460e83a4b7cab2fc810c42a509e0968.tar
forums-b12b1f8d6460e83a4b7cab2fc810c42a509e0968.tar.gz
forums-b12b1f8d6460e83a4b7cab2fc810c42a509e0968.tar.bz2
forums-b12b1f8d6460e83a4b7cab2fc810c42a509e0968.tar.xz
forums-b12b1f8d6460e83a4b7cab2fc810c42a509e0968.zip
New search 'stuff' ... not complete ... update
git-svn-id: file:///svn/phpbb/trunk@1053 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/search.php')
-rw-r--r--phpBB/search.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/search.php b/phpBB/search.php
index 7f082fa702..7cdee9c043 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -399,9 +399,9 @@ if( $query_keywords != "" || $query_author != "" || $search_id )
//
$sql_fields = ( $show_results == "posts") ? "pt.post_text, pt.post_subject, p.*, f.forum_name, t.*, u.username, u.user_id, u.user_sig" : "f.forum_id, f.forum_name, t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username" ;
- $sql_from = ( $show_results == "posts") ? FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt " : FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt, " . USERS_TABLE . " u2";
+ $sql_from = ( $show_results == "posts") ? FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt " : FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt, " . POSTS_TABLE . " p2, " . USERS_TABLE . " u2";
- $sql_where = ( $show_results == "posts") ? "pt.post_id = p.post_id AND f.forum_id = p.forum_id AND p.topic_id = t.topic_id AND p.poster_id = u.user_id" : "pt.post_id = p.post_id AND f.forum_id = p.forum_id AND t.topic_id = p.topic_id AND u.user_id = t.topic_poster AND p.poster_id = u2.user_id";
+ $sql_where = ( $show_results == "posts") ? "pt.post_id = p.post_id AND f.forum_id = p.forum_id AND p.topic_id = t.topic_id AND p.poster_id = u.user_id" : "pt.post_id = p.post_id AND f.forum_id = p.forum_id AND t.topic_id = p.topic_id AND u.user_id = t.topic_poster AND p2.post_id = t.topic_last_post_id AND u2.user_id = p2.poster_id";
$sql = "SELECT $sql_fields
FROM $sql_from ";