diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-11-28 18:38:49 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-11-28 18:38:49 +0000 |
| commit | 6d101df7dc3dc6f5542ccb11d626dcacbd148de6 (patch) | |
| tree | f55c85d2de9f11e9517b7f54fe3d0e2548af41e8 /phpBB/search.php | |
| parent | 0dc59b9e0d1bd7d10fa3dddae3541f2dba01f4ef (diff) | |
| download | forums-6d101df7dc3dc6f5542ccb11d626dcacbd148de6.tar forums-6d101df7dc3dc6f5542ccb11d626dcacbd148de6.tar.gz forums-6d101df7dc3dc6f5542ccb11d626dcacbd148de6.tar.bz2 forums-6d101df7dc3dc6f5542ccb11d626dcacbd148de6.tar.xz forums-6d101df7dc3dc6f5542ccb11d626dcacbd148de6.zip | |
- some SQL:2003 changes (basicly joins, mysql5 is sql:2003 compliant in strict mode now) - postgresql not supporting this standard. :/
- acp changes
git-svn-id: file:///svn/phpbb/trunk@5313 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 75ca8b57d3..0e5437b27c 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -82,9 +82,9 @@ if ($keywords || $author || $search_id || $search_session_id) // Which forums can we view? $sql_where = (sizeof($search_forum) && !$search_child) ? 'WHERE f.forum_id IN (' . implode(', ', $search_forum) . ')' : ''; $sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.right_id, f.forum_password, fa.user_id - FROM (' . FORUMS_TABLE . ' f + FROM ' . FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa ON (fa.forum_id = f.forum_id - AND fa.session_id = '" . $db->sql_escape($user->data['session_id']) . "')) + AND fa.session_id = '" . $db->sql_escape($user->data['session_id']) . "') $sql_where ORDER BY f.left_id"; $result = $db->sql_query($sql); @@ -583,9 +583,9 @@ if ($keywords || $author || $search_id || $search_session_id) // Search forum $s_forums = ''; $sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id, f.forum_password, fa.user_id - FROM (' . FORUMS_TABLE . ' f + FROM ' . FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa ON (fa.forum_id = f.forum_id - AND fa.session_id = '" . $db->sql_escape($user->data['session_id']) . "')) + AND fa.session_id = '" . $db->sql_escape($user->data['session_id']) . "') ORDER BY f.left_id ASC"; $result = $db->sql_query($sql); |