aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/search.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-11-17 17:40:19 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-11-17 17:40:19 +0000
commit96eb006ca123ba76edcb907a0807b7ef83c3c08d (patch)
tree0f4c80d3e3af8940e67ef3556e6314f976b2fd06 /phpBB/search.php
parent94b4a18e6c4edff7735518b464b883fec5897421 (diff)
downloadforums-96eb006ca123ba76edcb907a0807b7ef83c3c08d.tar
forums-96eb006ca123ba76edcb907a0807b7ef83c3c08d.tar.gz
forums-96eb006ca123ba76edcb907a0807b7ef83c3c08d.tar.bz2
forums-96eb006ca123ba76edcb907a0807b7ef83c3c08d.tar.xz
forums-96eb006ca123ba76edcb907a0807b7ef83c3c08d.zip
Fixed bug #482127 ... problem occurs when no bad word list exists
git-svn-id: file:///svn/phpbb/trunk@1348 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 24ad87eb87..46feaa2177 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -1,4 +1,4 @@
-<?php
+orig_word<?php
/***************************************************************************
* search.php
* -------------------
@@ -785,6 +785,7 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
$post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
$message = $searchset[$i]['post_text'];
+ $topic_title = $searchset[$i]['topic_title'];
if( $showresults == "posts" )
{
@@ -845,7 +846,7 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
if( count($orig_word) )
{
- $topic_title = preg_replace($orig_word, $replacement_word, $searchset[$i]['topic_title']);
+ $topic_title = preg_replace($orig_word, $replacement_word, $topic_title);
$post_subject = ( $searchset[$i]['post_subject'] != "" ) ? preg_replace($orig_word, $replacement_word, $searchset[$i]['post_subject']) : $topic_title;
$message = preg_replace($orig_word, $replacement_word, $message);