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

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

Author: toonarmy
Date: Sun Jul 19 01:00:33 2009
New Revision: 9789

Log:
Allow changing forum from drop down under certain circumstances. #37525

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.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 01:00:33 2009
***************
*** 165,170 ****
--- 165,171 ----
  		<li>[Fix] Reorder frame order of animated subsilver2 topic icons to be useful when animation is disabled. (Bug #29385 - Patch by prototech)</li>
  		<li>[Fix] Ensure user errors are displayed regardless of PHP settings. (Bug #47505)</li>
  		<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>[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_reports.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php Sun Jul 19 01:00:33 2009
***************
*** 258,264 ****
  				}
  				unset($forum_list_read);
  
! 				if ($topic_id && $forum_id)
  				{
  					$topic_info = get_topic_data(array($topic_id));
  
--- 258,264 ----
  				}
  				unset($forum_list_read);
  
! 				if ($topic_id)
  				{
  					$topic_info = get_topic_data(array($topic_id));
  
***************
*** 267,278 ****
  						trigger_error('TOPIC_NOT_EXIST');
  					}
  
! 					$topic_info = $topic_info[$topic_id];
! 					$forum_id = $topic_info['forum_id'];
! 				}
! 				else if ($topic_id && !$forum_id)
! 				{
! 					$topic_id = 0;
  				}
  
  				$forum_list = array();
--- 267,281 ----
  						trigger_error('TOPIC_NOT_EXIST');
  					}
  
! 					if ($forum_id != $topic_info[$topic_id]['forum_id'])
! 					{
! 						$topic_id = 0;
! 					}
! 					else
! 					{
! 						$topic_info = $topic_info[$topic_id];
! 						$forum_id = (int) $topic_info['forum_id'];
! 					}
  				}
  
  				$forum_list = array();