makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not allow setting forums parent to the forum itself. (Bug #18855)

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8870 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-09-18 13:21:16 +00:00
parent 6e3aadae80
commit 80254760d1
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -113,6 +113,7 @@
<li>[Fix] Expand shown ban reason in unban screen to fully show long entries. (Bug #16234)</li> <li>[Fix] Expand shown ban reason in unban screen to fully show long entries. (Bug #16234)</li>
<li>[Fix] Preserve alpha transparency for created thumbnails. (Bug #16575)</li> <li>[Fix] Preserve alpha transparency for created thumbnails. (Bug #16575)</li>
<li>[Fix] Use correct port delimiter for MSSQL connections in windows. (Bug #16615)</li> <li>[Fix] Use correct port delimiter for MSSQL connections in windows. (Bug #16615)</li>
<li>[Fix] Do not allow setting forums parent to the forum itself. (Bug #18855)</li>
<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li> <li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
<li>[Change] Display warning in ACP if config.php file is left writable.</li> <li>[Change] Display warning in ACP if config.php file is left writable.</li>

10
phpBB/includes/acp/acp_forums.php
View file

@ -922,10 +922,9 @@ class acp_forums
$range_test_ary = array( $range_test_ary = array(
array('lang' => 'FORUM_TOPICS_PAGE', 'value' => $forum_data['forum_topics_per_page'], 'column_type' => 'TINT:0'), array('lang' => 'FORUM_TOPICS_PAGE', 'value' => $forum_data['forum_topics_per_page'], 'column_type' => 'TINT:0'),
); );
validate_range($range_test_ary, $errors); validate_range($range_test_ary, $errors);
// Set forum flags // Set forum flags
// 1 = link tracking // 1 = link tracking
// 2 = prune old polls // 2 = prune old polls
@ -1205,9 +1204,16 @@ class acp_forums
} }
if ($row['parent_id'] != $forum_data_sql['parent_id']) if ($row['parent_id'] != $forum_data_sql['parent_id'])
{
if ($row['forum_id'] != $forum_data_sql['parent_id'])
{ {
$errors = $this->move_forum($forum_data_sql['forum_id'], $forum_data_sql['parent_id']); $errors = $this->move_forum($forum_data_sql['forum_id'], $forum_data_sql['parent_id']);
} }
else
{
$forum_data_sql['parent_id'] = $row['parent_id'];
}
}
if (sizeof($errors)) if (sizeof($errors))
{ {