diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-10-14 17:56:46 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-10-14 17:56:46 +0200 |
| commit | 95fed7806d0811aee69b5da141ef47d4abb41f01 (patch) | |
| tree | f7169f2809d089578a48d65ffe5d0e77158136d2 /phpBB/includes/mcp/mcp_main.php | |
| parent | 99d6f00d514f77059384d88cace34faec3d09022 (diff) | |
| parent | 7813135365c5765f8bfc70afc26047fa4e4914a9 (diff) | |
| download | forums-95fed7806d0811aee69b5da141ef47d4abb41f01.tar forums-95fed7806d0811aee69b5da141ef47d4abb41f01.tar.gz forums-95fed7806d0811aee69b5da141ef47d4abb41f01.tar.bz2 forums-95fed7806d0811aee69b5da141ef47d4abb41f01.tar.xz forums-95fed7806d0811aee69b5da141ef47d4abb41f01.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10377] Do not allow all moderators to sticky posts
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 6c6c5a5532..e0a1357213 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -286,14 +286,6 @@ function change_topic_type($action, $topic_ids) { global $auth, $user, $db, $phpEx, $phpbb_root_path; - // For changing topic types, we only allow operations in one forum. - $forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('f_announce', 'f_sticky', 'm_'), true); - - if ($forum_id === false) - { - return; - } - switch ($action) { case 'make_announce': @@ -316,11 +308,18 @@ function change_topic_type($action, $topic_ids) default: $new_topic_type = POST_NORMAL; - $check_acl = ''; + $check_acl = false; $l_new_type = (sizeof($topic_ids) == 1) ? 'MCP_MAKE_NORMAL' : 'MCP_MAKE_NORMALS'; break; } + $forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', $check_acl, true); + + if ($forum_id === false) + { + return; + } + $redirect = request_var('redirect', build_url(array('action', 'quickmod'))); $s_hidden_fields = array( |