aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-06-29 10:59:36 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-06-29 10:59:36 +0000
commit4d6a76730501a55e696971845c90f364a3921512 (patch)
tree107f63c438532906a5b5ad72576fb3e39d1259ed /phpBB/includes/message_parser.php
parentb85637fc1a326803f70dbf8018ed505cb0258010 (diff)
downloadforums-4d6a76730501a55e696971845c90f364a3921512.tar
forums-4d6a76730501a55e696971845c90f364a3921512.tar.gz
forums-4d6a76730501a55e696971845c90f364a3921512.tar.bz2
forums-4d6a76730501a55e696971845c90f364a3921512.tar.xz
forums-4d6a76730501a55e696971845c90f364a3921512.zip
a few fixes
git-svn-id: file:///svn/phpbb/trunk@4184 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 5d58845303..e05f7c8de4 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -830,9 +830,18 @@ class parse_message
{
$this->warn_msg[] = $user->lang['NO_DELETE_POLL_OPTIONS'];
}
+ elseif ($poll_data['poll_max_options'] > sizeof($poll['poll_options']))
+ {
+ $this->warn_msg[] = $user->lang['TOO_MANY_USER_OPTIONS'];
+ }
$poll['poll_title'] = (!empty($poll_data['poll_title'])) ? trim(htmlspecialchars(strip_tags($poll_data['poll_title']))) : '';
$poll['poll_length'] = (!empty($poll_data['poll_length'])) ? intval($poll_data['poll_length']) : 0;
+
+ if (empty($poll['poll_title']) && $poll['poll_options_size'])
+ {
+ $this->warn_msg[] = $user->lang['NO_POLL_TITLE'];
+ }
}
$poll['poll_start'] = $poll_data['poll_start'];