diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-05 22:48:17 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-05 22:48:17 +0000 |
commit | 9551bfbc5236aed8af8ed3fe6d6f4631d630bfbc (patch) | |
tree | 595afed6d91efaf07647049d7f7f04bd6ab96377 /phpBB/includes/message_parser.php | |
parent | becf5f5199df27f82c7dac0954211d21f5a15ba7 (diff) | |
download | forums-9551bfbc5236aed8af8ed3fe6d6f4631d630bfbc.tar forums-9551bfbc5236aed8af8ed3fe6d6f4631d630bfbc.tar.gz forums-9551bfbc5236aed8af8ed3fe6d6f4631d630bfbc.tar.bz2 forums-9551bfbc5236aed8af8ed3fe6d6f4631d630bfbc.tar.xz forums-9551bfbc5236aed8af8ed3fe6d6f4631d630bfbc.zip |
email topic, minor other changes, removed updating of parent forums upon posting (handled by functions_display)
git-svn-id: file:///svn/phpbb/trunk@3980 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r-- | phpBB/includes/message_parser.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index c86b093ef8..2af189a69c 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -84,7 +84,7 @@ class parse_message } // Smiley check - if (intval($config['max_post_smilies']) && $smilies ) + if (intval($config['max_post_smilies']) && $smilies) { $sql = "SELECT code FROM " . SMILIES_TABLE; @@ -304,7 +304,7 @@ class parse_message $str_to = array('[', ']', '.'); $out .= "[code=$stx:" . $this->bbcode_uid . ']' . str_replace($str_from, $str_to, $code) . '[/code:' . $this->bbcode_uid . ']'; - break; + break; default: $str_from = array('<', '>', '[', ']', '.'); @@ -361,7 +361,7 @@ class parse_message $out .= $tag . ']'; $tok = '['; } - elseif (preg_match('/list(=?(?:[0-9]|[a-z]|))/i', $buffer, $m)) + elseif (preg_match('#list(=?(?:[0-9]|[a-z]|))#i', $buffer, $m)) { // sub-list, add a closing tag array_push($close_tags, (($m[1]) ? '/list:o:' . $this->bbcode_uid : '/list:u:' . $this->bbcode_uid)); @@ -820,7 +820,7 @@ class fulltext_search $words = array(); if ($mode == 'edit') { - $sql = "SELECT w.word_id, w.word_text, m.title_match + echo $sql = "SELECT w.word_id, w.word_text, m.title_match FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m WHERE m.post_id = " . intval($post_id) . " AND w.word_id = m.word_id"; |