aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-03-31 13:47:53 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-03-31 13:47:53 +0000
commitc191a04a9d5cca0cc7fbe7aad51af70c0ab701ba (patch)
treea5f7280f5fe0ceec4ceff7dc48d47628e8c10d8f
parentcfb5acec81b2c7bc2644c0ca14e5d33c4306b562 (diff)
downloadforums-c191a04a9d5cca0cc7fbe7aad51af70c0ab701ba.tar
forums-c191a04a9d5cca0cc7fbe7aad51af70c0ab701ba.tar.gz
forums-c191a04a9d5cca0cc7fbe7aad51af70c0ab701ba.tar.bz2
forums-c191a04a9d5cca0cc7fbe7aad51af70c0ab701ba.tar.xz
forums-c191a04a9d5cca0cc7fbe7aad51af70c0ab701ba.zip
search_id change broke various other search options, fixed
git-svn-id: file:///svn/phpbb/trunk@2452 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/search.php29
1 files changed, 16 insertions, 13 deletions
diff --git a/phpBB/search.php b/phpBB/search.php
index ae408dfd61..220b001781 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -66,7 +66,7 @@ else
$search_author = '';
}
-$search_id = ( isset($HTTP_GET_VARS['search_id']) ) ? intval($HTTP_GET_VARS['search_id']) : '';
+$search_id = ( isset($HTTP_GET_VARS['search_id']) ) ? $HTTP_GET_VARS['search_id'] : '';
$show_results = ( isset($HTTP_POST_VARS['show_results']) ) ? $HTTP_POST_VARS['show_results'] : 'posts';
@@ -592,21 +592,24 @@ else if ( $search_keywords != '' || $search_author != '' || $search_id )
}
else
{
- $sql = "SELECT search_array
- FROM " . SEARCH_TABLE . "
- WHERE search_id = $search_id
- AND session_id = '". $userdata['session_id'] . "'";
- if ( !($result = $db->sql_query($sql)) )
+ if ( is_int($search_id) )
{
- message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql);
- }
+ $sql = "SELECT search_array
+ FROM " . SEARCH_TABLE . "
+ WHERE search_id = $search_id
+ AND session_id = '". $userdata['session_id'] . "'";
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql);
+ }
- if ( $row = $db->sql_fetchrow($result) )
- {
- $search_data = unserialize($row['search_array']);
- for($i = 0; $i < count($store_vars); $i++)
+ if ( $row = $db->sql_fetchrow($result) )
{
- $$store_vars[$i] = $search_data[$store_vars[$i]];
+ $search_data = unserialize($row['search_array']);
+ for($i = 0; $i < count($store_vars); $i++)
+ {
+ $$store_vars[$i] = $search_data[$store_vars[$i]];
+ }
}
}
}