diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-01-18 16:41:21 +0000 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-01-18 16:41:21 +0000 |
| commit | ad14664a3a53c270511bc19392c38b60a2c3e3ff (patch) | |
| tree | c159a97c1780bd83cd763a6cff321803eff40108 /phpBB/includes/mcp | |
| parent | cb389894e948b2e23473d1de21c5843ac1059a8c (diff) | |
| download | forums-ad14664a3a53c270511bc19392c38b60a2c3e3ff.tar forums-ad14664a3a53c270511bc19392c38b60a2c3e3ff.tar.gz forums-ad14664a3a53c270511bc19392c38b60a2c3e3ff.tar.bz2 forums-ad14664a3a53c270511bc19392c38b60a2c3e3ff.tar.xz forums-ad14664a3a53c270511bc19392c38b60a2c3e3ff.zip | |
- Bug #56255 - Moving topics to a forum where you are on queue
- Allow some error handling in compress class by returning false if file does not exist.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10427 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 50b05e989f..80c3559649 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -568,7 +568,7 @@ function mcp_move_topic($topic_ids) { $additional_msg = $user->lang['FORUM_NOT_POSTABLE']; } - else if (!$auth->acl_get('f_post', $to_forum_id)) + else if (!$auth->acl_get('f_post', $to_forum_id) || (!$auth->acl_get('m_approve', $to_forum_id) && !$auth->acl_get('f_noapprove', $to_forum_id))) { $additional_msg = $user->lang['USER_CANNOT_POST']; } |