aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_posting.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-11-01 15:40:22 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-11-01 15:40:22 +0000
commitac0c0f5247dd5b363bef4f6e26178dff933c1dd2 (patch)
tree8b03f0ae59455dec57807240f3e6485f92f9c8b3 /phpBB/includes/functions_posting.php
parentab669d0f040ddd6d82022b08dfabb3ea751daaaa (diff)
downloadforums-ac0c0f5247dd5b363bef4f6e26178dff933c1dd2.tar
forums-ac0c0f5247dd5b363bef4f6e26178dff933c1dd2.tar.gz
forums-ac0c0f5247dd5b363bef4f6e26178dff933c1dd2.tar.bz2
forums-ac0c0f5247dd5b363bef4f6e26178dff933c1dd2.tar.xz
forums-ac0c0f5247dd5b363bef4f6e26178dff933c1dd2.zip
More minor changes
git-svn-id: file:///svn/phpbb/trunk@3004 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-rw-r--r--phpBB/includes/functions_posting.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 5385b1db9e..4ef5585b27 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -46,7 +46,7 @@ class parse_message
// Message length check
if (!strlen($message) || ($config['max_post_chars'] && strlen($message) > intval($config['max_post_chars'])))
{
- $warn_msg .= ( !strlen($message) ) ? $user->lang['Too_few_chars'] . '<br />' : $user->lang['Too_many_chars'] . '<br />';
+ $warn_msg .= (($warn_msg != '') ? '<br />' : '') . (!strlen($message)) ? $user->lang['Too_few_chars'] : $user->lang['Too_many_chars'];
}
// Smiley check
@@ -66,7 +66,7 @@ class parse_message
if ($match > intval($config['max_post_smilies']))
{
- $warn_msg .= $user->lang['Too_many_smilies'] . '<br />';
+ $warn_msg .= (($warn_msg != '') ? '<br />' : '') . $user->lang['Too_many_smilies'];
break;
}
}
@@ -82,11 +82,11 @@ class parse_message
return $warn_msg;
}
- $warn_msg .= $this->html($message, $html);
- $warn_msg .= $this->bbcode($message, $bbcode, $uid);
- $warn_msg .= $this->emoticons($message, $smilies);
- $warn_msg .= $this->magic_url($message, $url);
- $warn_msg .= $this->attach($_FILE);
+ $warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->html($message, $html);
+ $warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->bbcode($message, $bbcode, $uid);
+ $warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->emoticons($message, $smilies);
+ $warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->magic_url($message, $url);
+ $warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->attach($_FILE);
return $warn_msg;
}