diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-06-29 10:59:36 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-06-29 10:59:36 +0000 |
| commit | 4d6a76730501a55e696971845c90f364a3921512 (patch) | |
| tree | 107f63c438532906a5b5ad72576fb3e39d1259ed /phpBB/includes | |
| parent | b85637fc1a326803f70dbf8018ed505cb0258010 (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/includes/functions_display.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index e80d29c89f..ea1f8315fa 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -44,7 +44,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) break; default: - $sql_from = '(' . FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id)'; + $sql_from = '(' . FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id))'; break; } $lastread_select = ', ft.mark_time '; diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index b27c88c3cf..55662b3815 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -124,7 +124,7 @@ function format_display(&$message, &$signature, $uid, $siguid, $html, $bbcode, $ $signature = ''; } - return; + return $message; } // Update Last Post Informations 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']; |