diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-16 14:02:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-16 14:02:06 +0000 |
| commit | 683930ca4a31d502b704bbb9366938b4ed6562b1 (patch) | |
| tree | cd1f3d62969335b3904f8bcea01a0fa3d8ac70a7 /phpBB/includes/acp/acp_forums.php | |
| parent | d4675c109aa65a909b97061643222f4f2d9fb140 (diff) | |
| download | forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar.gz forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar.bz2 forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar.xz forums-683930ca4a31d502b704bbb9366938b4ed6562b1.zip | |
- Handle forum links/redirects within viewforum if no read permission given (to display login box or error message) (Bug #13467)
- Prevent changing postable forum having subforums to link forum without moving subforums out first
git-svn-id: file:///svn/phpbb/trunk@7895 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index ced09a4708..96f7a15255 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -991,6 +991,13 @@ class acp_forums if ($row['forum_type'] == FORUM_POST && $row['forum_type'] != $forum_data_sql['forum_type']) { + // Has subforums and want to change into a link? + if ($row['right_id'] - $row['left_id'] > 1 && $forum_data_sql['forum_type'] == FORUM_LINK) + { + $errors[] = $user->lang['FORUM_WITH_SUBFORUMS_NOT_TO_LINK']; + return $errors; + } + // we're turning a postable forum into a non-postable forum if ($forum_data_sql['type_action'] == 'move') { |