aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/search.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-03-21 22:43:07 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-03-21 22:43:07 +0000
commita4e51c9699c7a09bea32ad832a9818abba008801 (patch)
tree42feb7021db4bd9cb9334e65b23260d491d3b131 /phpBB/search.php
parent68b7397da8197d23dae07fc0e7927697cb1e3492 (diff)
downloadforums-a4e51c9699c7a09bea32ad832a9818abba008801.tar
forums-a4e51c9699c7a09bea32ad832a9818abba008801.tar.gz
forums-a4e51c9699c7a09bea32ad832a9818abba008801.tar.bz2
forums-a4e51c9699c7a09bea32ad832a9818abba008801.tar.xz
forums-a4e51c9699c7a09bea32ad832a9818abba008801.zip
- first try to break things...
git-svn-id: file:///svn/phpbb/trunk@5108 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/search.php')
-rw-r--r--phpBB/search.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/search.php b/phpBB/search.php
index ac3226372c..91877d98cd 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -139,7 +139,8 @@ if ($search_keywords || $search_author || $search_id)
$sql_where = (strstr($search_author, '*') !== false) ? ' LIKE ' : ' = ';
$sql = 'SELECT user_id
FROM ' . USERS_TABLE . "
- WHERE username $sql_where '" . $db->sql_escape(preg_replace('#\*+#', '%', $search_author)) . "'";
+ WHERE username $sql_where '" . $db->sql_escape(preg_replace('#\*+#', '%', $search_author)) . "'
+ AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
$result = $db->sql_query($sql);
if (!$row = $db->sql_fetchrow($result))
@@ -758,7 +759,7 @@ if ($search_keywords || $search_author || $search_id)
// via php.net's annotated manual
$row['post_text'] = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace('#\b(" . $hilit . ")\b#i', '<span class=\"posthilit\">\\\\1</span>', '\\0')", '>' . $row['post_text'] . '<'), 1, -1));
- $row['post_text'] = smilie_text($row['post_text']);
+ $row['post_text'] = smiley_text($row['post_text']);
$tpl_ary = array(
'POSTER_NAME' => ($row['poster_id'] == ANONYMOUS) ? ((!empty($row['post_username'])) ? $row['post_username'] : $user->lang['GUEST']) : $row['username'],