aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-03-20 13:21:58 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-03-20 13:21:58 +0000
commit73ffe96e2edac38ef785d4f5a9cfe24798fe2cbe (patch)
treedcb2414a660576504901d4e5ba5032ad87278350 /phpBB/includes/message_parser.php
parentab3209af48545c6d59fae7dac0f4419c455c6e73 (diff)
downloadforums-73ffe96e2edac38ef785d4f5a9cfe24798fe2cbe.tar
forums-73ffe96e2edac38ef785d4f5a9cfe24798fe2cbe.tar.gz
forums-73ffe96e2edac38ef785d4f5a9cfe24798fe2cbe.tar.bz2
forums-73ffe96e2edac38ef785d4f5a9cfe24798fe2cbe.tar.xz
forums-73ffe96e2edac38ef785d4f5a9cfe24798fe2cbe.zip
prepare files, last commit before committing initial attachment functionality - please see thread within development forum.
git-svn-id: file:///svn/phpbb/trunk@3695 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 464fb367b2..da1f96c601 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -31,7 +31,7 @@ class parse_message
$this->message_mode = $message_type;
}
- function parse(&$message, $html, $bbcode, $uid, $url, $smilies, $attach = false)
+ function parse(&$message, $html, $bbcode, $uid, $url, $smilies, $attach)
{
global $config, $db, $user;
@@ -54,7 +54,7 @@ class parse_message
if (intval($config['max_post_smilies']) && $smilies )
{
$sql = "SELECT code
- FROM " . SMILIES_TABLE;
+ FROM " . SMILIES_TABLE;
$result = $db->sql_query($sql);
$match = 0;
@@ -156,7 +156,7 @@ class parse_message
global $db, $user;
$sql = "SELECT *
- FROM " . SMILIES_TABLE;
+ FROM " . SMILIES_TABLE;
$result = $db->sql_query($sql);
if ($row = $db->sql_fetchrow($result))