mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

a few fixes

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@4184 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2003-06-29 10:59:36 +00:00
parent b85637fc1a
commit 4d6a767305
8 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions_display.php
View File

@@ -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 ';

2
phpBB/includes/functions_posting.php
View File

@@ -124,7 +124,7 @@ function format_display(&$message, &$signature, $uid, $siguid, $html, $bbcode, $
$signature = '';
}
return;
return $message;
}
// Update Last Post Informations

9
phpBB/includes/message_parser.php
View File

@@ -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'];