aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2009-07-19 01:00:33 +0000
committerChris Smith <toonarmy@phpbb.com>2009-07-19 01:00:33 +0000
commit208f74970b15d255a83f9c9a58c5ba4ddf596b86 (patch)
tree6d22431bcbf21a7a1a707631d219a037f1a14b29
parent4f6f9c424d124ec3839809828bbe45ae7a17436a (diff)
downloadforums-208f74970b15d255a83f9c9a58c5ba4ddf596b86.tar
forums-208f74970b15d255a83f9c9a58c5ba4ddf596b86.tar.gz
forums-208f74970b15d255a83f9c9a58c5ba4ddf596b86.tar.bz2
forums-208f74970b15d255a83f9c9a58c5ba4ddf596b86.tar.xz
forums-208f74970b15d255a83f9c9a58c5ba4ddf596b86.zip
Allow changing forum from drop down under certain circumstances. #37525
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9789 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/mcp/mcp_reports.php17
2 files changed, 11 insertions, 7 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 40e938546c..f4a79411d1 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -165,6 +165,7 @@
<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>
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 27d841c81b..cc701a0540 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -258,7 +258,7 @@ class mcp_reports
}
unset($forum_list_read);
- if ($topic_id && $forum_id)
+ if ($topic_id)
{
$topic_info = get_topic_data(array($topic_id));
@@ -267,12 +267,15 @@ class mcp_reports
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;
+ 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();