[Phpbb-checkins] r9797 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html includes/mcp/mcp_main.php

[Chris S. <too...@ph...>]

Author: toonarmy
Date: Sun Jul 19 11:34:01 2009
New Revision: 9797

Log:
Copy poll options properly when copying topic. #39065

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sun Jul 19 11:34:01 2009
***************
*** 167,172 ****
--- 167,173 ----
  		<li>[Fix] Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. (Bug #40925)</li>
  		<li>[Fix] Allow changing forum from select box under certain circumstances. (Bug #37525)</li>
  		<li>[Fix] Display required fields notice on registration above the custom profile fields. (Bug #39665)</li>
+ 		<li>[Fix] Copy poll options properly when copying topic. (Bug #39065)</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
  		<li>[Change] Template engine now permits to a limited extent variable includes.</li>

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php Sun Jul 19 11:34:01 2009
***************
*** 1064,1070 ****
  				'topic_bumper'				=> (int) $topic_row['topic_bumper'],
  				'poll_title'				=> (string) $topic_row['poll_title'],
  				'poll_start'				=> (int) $topic_row['poll_start'],
! 				'poll_length'				=> (int) $topic_row['poll_length']
  			);
  
  			$db->sql_query('INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
--- 1064,1072 ----
  				'topic_bumper'				=> (int) $topic_row['topic_bumper'],
  				'poll_title'				=> (string) $topic_row['poll_title'],
  				'poll_start'				=> (int) $topic_row['poll_start'],
! 				'poll_length'				=> (int) $topic_row['poll_length'],
! 				'poll_max_options'			=> (int) $topic_row['poll_max_options'],
! 				'poll_vote_change'			=> (int) $topic_row['poll_vote_change'],
  			);
  
  			$db->sql_query('INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));