From 47769529595a81fe2063fc0222036192f0aa4e62 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 7 Sep 2010 16:10:29 +0200
Subject: [PATCH 1/3] [ticket/9804] Update docs/AUTHORS. Move DavidMJ, add
 evil<3.

PHPBB3-9804
---
 phpBB/docs/AUTHORS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 84677c4e15..d6af9d1db9 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -26,8 +26,8 @@ phpBB Developers:      A_Jelly_Doughnut (Josh Woody)
                        Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
                        APTX (Marek A. R.)
                        bantu (Andreas Fischer)
-                       DavidMJ (David M.)
                        dhn (Dominik Dröscher)
+                       evil<3 (Igor Wiedler)
                        kellanved (Henry Sudhof)
                        nickvergessen (Joas Schilling)
                        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]
                        BartVB (Bart van Bragt)     [11/2000 - 03/2006]
+                       DavidMJ (David M.)          [12/2005 - 08/2009]
                        GrahamJE (Graham Eames)     [09/2005 - 11/2006]
                        Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009]
 

From a81c857c96ee1a2a9be559ff3c9b71ca9514287e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 14 Sep 2010 13:20:38 +0200
Subject: [PATCH 2/3] [ticket/9162] BBCode in poll options is broken, when
 posting without question.

PHPBB3-9162
---
 phpBB/posting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/posting.php b/phpBB/posting.php
index 8cacac2910..7c36f40ca7 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1297,7 +1297,7 @@ $attachment_data = $message_parser->attachment_data;
 $filename_data = $message_parser->filename_data;
 $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->bbcode_uid = $post_data['bbcode_uid'];

From ffd9437948e4e5cb20005f8f60913f8d80805995 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 14 Sep 2010 13:10:50 +0200
Subject: [PATCH 3/3] [ticket/9820] phpBB Debug Error when trying to post a new
 topic.

Regression from aa4519fb44f4ff83e923c6cc4d5bde3f20082340

PHPBB3-9820
PHPBB3-7260
---
 phpBB/posting.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/phpBB/posting.php b/phpBB/posting.php
index 8cacac2910..a793159a2d 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -402,15 +402,18 @@ if ($post_data['poll_start'])
 	$db->sql_freeresult($result);
 }
 
-$original_poll_data = array(
-	'poll_title'		=> $post_data['poll_title'],
-	'poll_length'		=> $post_data['poll_length'],
-	'poll_max_options'	=> $post_data['poll_max_options'],
-	'poll_option_text'	=> implode("\n", $post_data['poll_options']),
-	'poll_start'		=> $post_data['poll_start'],
-	'poll_last_vote'	=> $post_data['poll_last_vote'],
-	'poll_vote_change'	=> $post_data['poll_vote_change'],
-);
+if ($mode == 'edit')
+{
+	$original_poll_data = array(
+		'poll_title'		=> $post_data['poll_title'],
+		'poll_length'		=> $post_data['poll_length'],
+		'poll_max_options'	=> $post_data['poll_max_options'],
+		'poll_option_text'	=> implode("\n", $post_data['poll_options']),
+		'poll_start'		=> $post_data['poll_start'],
+		'poll_last_vote'	=> $post_data['poll_last_vote'],
+		'poll_vote_change'	=> $post_data['poll_vote_change'],
+	);
+}
 
 $orig_poll_options_size = sizeof($post_data['poll_options']);