makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/9820] phpBB Debug Error when trying to post a new topic.
  [ticket/9162] BBCode in poll options is broken, when posting without question.
  [ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
This commit is contained in:
Andreas Fischer 2010-09-14 16:58:35 +02:00
commit 85e32046e3
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/docs/AUTHORS
View file

@ -26,8 +26,8 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody)
Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010] Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
APTX (Marek A. R.) APTX (Marek A. R.)
bantu (Andreas Fischer) bantu (Andreas Fischer)
DavidMJ (David M.)
dhn (Dominik Dröscher) dhn (Dominik Dröscher)
evil<3 (Igor Wiedler)
kellanved (Henry Sudhof) kellanved (Henry Sudhof)
nickvergessen (Joas Schilling) nickvergessen (Joas Schilling)
rxu (Ruslan Uzdenov) rxu (Ruslan Uzdenov)
@ -49,6 +49,7 @@ phpBB Lead Developer: psoTFX (Paul S. Owen) [2001 - 09/2005]
phpBB Developers: Ashe (Ludovic Arnaud) [10/2002 - 11/2003, 06/2006 - 10/2006] phpBB Developers: Ashe (Ludovic Arnaud) [10/2002 - 11/2003, 06/2006 - 10/2006]
BartVB (Bart van Bragt) [11/2000 - 03/2006] BartVB (Bart van Bragt) [11/2000 - 03/2006]
DavidMJ (David M.) [12/2005 - 08/2009]
GrahamJE (Graham Eames) [09/2005 - 11/2006] GrahamJE (Graham Eames) [09/2005 - 11/2006]
Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009] Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009]

9
phpBB/posting.php
View file

@ -402,7 +402,9 @@ if ($post_data['poll_start'])
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
$original_poll_data = array( if ($mode == 'edit')
{
$original_poll_data = array(
'poll_title' => $post_data['poll_title'], 'poll_title' => $post_data['poll_title'],
'poll_length' => $post_data['poll_length'], 'poll_length' => $post_data['poll_length'],
'poll_max_options' => $post_data['poll_max_options'], 'poll_max_options' => $post_data['poll_max_options'],
@ -410,7 +412,8 @@ $original_poll_data = array(
'poll_start' => $post_data['poll_start'], 'poll_start' => $post_data['poll_start'],
'poll_last_vote' => $post_data['poll_last_vote'], 'poll_last_vote' => $post_data['poll_last_vote'],
'poll_vote_change' => $post_data['poll_vote_change'], 'poll_vote_change' => $post_data['poll_vote_change'],
); );
}
$orig_poll_options_size = sizeof($post_data['poll_options']); $orig_poll_options_size = sizeof($post_data['poll_options']);
@ -1297,7 +1300,7 @@ $attachment_data = $message_parser->attachment_data;
$filename_data = $message_parser->filename_data; $filename_data = $message_parser->filename_data;
$post_data['post_text'] = $message_parser->message; $post_data['post_text'] = $message_parser->message;
if (sizeof($post_data['poll_options']) && $post_data['poll_title']) if (sizeof($post_data['poll_options']) || $post_data['poll_title'])
{ {
$message_parser->message = $post_data['poll_title']; $message_parser->message = $post_data['poll_title'];
$message_parser->bbcode_uid = $post_data['bbcode_uid']; $message_parser->bbcode_uid = $post_data['bbcode_uid'];