Merge branch 'develop-ascraeus' into develop

This commit is contained in:
Joas Schilling 2014-11-21 23:33:51 +01:00
commit 47d3865fa6

View file

@ -1161,7 +1161,7 @@ if ($submit || $preview || $refresh)
break; break;
} }
if (!$auth->acl_get($auth_option, $forum_id)) if ($auth_option != '' && !$auth->acl_get($auth_option, $forum_id))
{ {
// There is a special case where a user edits his post whereby the topic type got changed by an admin/mod. // There is a special case where a user edits his post whereby the topic type got changed by an admin/mod.
// Another case would be a mod not having sticky permissions for example but edit permissions. // Another case would be a mod not having sticky permissions for example but edit permissions.