diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-18 13:21:16 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-18 13:21:16 +0000 |
| commit | 80254760d1aeb57d36a68039621b3998b83deaef (patch) | |
| tree | 8e42185d0f1224208a83172219b9c9cee8683cfb /phpBB/includes | |
| parent | 6e3aadae808b21ad726ad5caeadafc5ef163bc28 (diff) | |
| download | forums-80254760d1aeb57d36a68039621b3998b83deaef.tar forums-80254760d1aeb57d36a68039621b3998b83deaef.tar.gz forums-80254760d1aeb57d36a68039621b3998b83deaef.tar.bz2 forums-80254760d1aeb57d36a68039621b3998b83deaef.tar.xz forums-80254760d1aeb57d36a68039621b3998b83deaef.zip | |
Do not allow setting forums parent to the forum itself. (Bug #18855)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8870 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index fa07c00dee..5b4d0939d4 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -922,9 +922,8 @@ class acp_forums $range_test_ary = array( 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 // 1 = link tracking @@ -1206,7 +1205,14 @@ class acp_forums if ($row['parent_id'] != $forum_data_sql['parent_id']) { - $errors = $this->move_forum($forum_data_sql['forum_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']); + } + else + { + $forum_data_sql['parent_id'] = $row['parent_id']; + } } if (sizeof($errors)) |