aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-09-14 16:29:21 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-09-14 16:29:21 +0200
commitb4b3efa45b11d7df37b1fe2a5b4fad3b5b59dbe1 (patch)
tree751487371aff6c397e137403dae6940ae84bb4e1
parent05c88bb00d821f1fed8831e231f2302eb6df6125 (diff)
parentffd9437948e4e5cb20005f8f60913f8d80805995 (diff)
downloadforums-b4b3efa45b11d7df37b1fe2a5b4fad3b5b59dbe1.tar
forums-b4b3efa45b11d7df37b1fe2a5b4fad3b5b59dbe1.tar.gz
forums-b4b3efa45b11d7df37b1fe2a5b4fad3b5b59dbe1.tar.bz2
forums-b4b3efa45b11d7df37b1fe2a5b4fad3b5b59dbe1.tar.xz
forums-b4b3efa45b11d7df37b1fe2a5b4fad3b5b59dbe1.zip
Merge branch 'ticket/nickvergessen/9820' into develop-olympus
* ticket/nickvergessen/9820: [ticket/9820] phpBB Debug Error when trying to post a new topic.
-rw-r--r--phpBB/posting.php21
1 files 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']);