diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-23 09:41:54 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-23 09:41:54 +0000 |
| commit | 35eea4539a646b07ac86374e857d7b0ff65d1bff (patch) | |
| tree | 662869cf988a7f7ce7dbd971208ae88413b34f63 /phpBB/includes/mcp | |
| parent | 87eb1d9f20d2c534b20baed199e0b96f1f9df98d (diff) | |
| download | forums-35eea4539a646b07ac86374e857d7b0ff65d1bff.tar forums-35eea4539a646b07ac86374e857d7b0ff65d1bff.tar.gz forums-35eea4539a646b07ac86374e857d7b0ff65d1bff.tar.bz2 forums-35eea4539a646b07ac86374e857d7b0ff65d1bff.tar.xz forums-35eea4539a646b07ac86374e857d7b0ff65d1bff.zip | |
check for m_split and m_merge permission on target topic and topic icon selection (Bug #51675)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10180 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index e73cccce1e..eb3d6d3970 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -259,7 +259,7 @@ function mcp_topic_view($id, $mode, $action) // Display topic icons for split topic $s_topic_icons = false; - if ($auth->acl_get('m_split', $topic_info['forum_id'])) + if ($auth->acl_gets('m_split', 'm_merge', (int) $topic_info['forum_id'])) { include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); $s_topic_icons = posting_gen_topic_icons('', $icon_id); |