diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-08-08 16:11:47 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-08-08 16:11:47 +0200 |
| commit | 28d95a7d7e0fef86bee8cedd3f5ff46f925a5785 (patch) | |
| tree | f1b7a192323290beaf074a3da764e4be1c380d56 | |
| parent | a291825685edcb00c5896facd4c7a4ae535de721 (diff) | |
| parent | f6da2661091a9f068956a23df7e70450cec9ee74 (diff) | |
| download | forums-28d95a7d7e0fef86bee8cedd3f5ff46f925a5785.tar forums-28d95a7d7e0fef86bee8cedd3f5ff46f925a5785.tar.gz forums-28d95a7d7e0fef86bee8cedd3f5ff46f925a5785.tar.bz2 forums-28d95a7d7e0fef86bee8cedd3f5ff46f925a5785.tar.xz forums-28d95a7d7e0fef86bee8cedd3f5ff46f925a5785.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12886] Remove obsolete check for f_user_lock
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 1fdce5a6c3..50481302e6 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -539,8 +539,8 @@ $s_quickmod_action = append_sid( $quickmod_array = array( // 'key' => array('LANG_KEY', $userHasPermissions), - 'lock' => array('LOCK_TOPIC', ($topic_data['topic_status'] == ITEM_UNLOCKED) && ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && $user->data['user_id'] == $topic_data['topic_poster'] && $topic_data['topic_status'] == ITEM_UNLOCKED))), - 'unlock' => array('UNLOCK_TOPIC', ($topic_data['topic_status'] != ITEM_UNLOCKED) && ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && $user->data['user_id'] == $topic_data['topic_poster'] && $topic_data['topic_status'] == ITEM_UNLOCKED))), + 'lock' => array('LOCK_TOPIC', ($topic_data['topic_status'] == ITEM_UNLOCKED) && ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && $user->data['user_id'] == $topic_data['topic_poster']))), + 'unlock' => array('UNLOCK_TOPIC', ($topic_data['topic_status'] != ITEM_UNLOCKED) && ($auth->acl_get('m_lock', $forum_id))), 'delete_topic' => array('DELETE_TOPIC', ($auth->acl_get('m_delete', $forum_id) || (($topic_data['topic_visibility'] != ITEM_DELETED) && $auth->acl_get('m_softdelete', $forum_id)))), 'restore_topic' => array('RESTORE_TOPIC', (($topic_data['topic_visibility'] == ITEM_DELETED) && $auth->acl_get('m_approve', $forum_id))), 'move' => array('MOVE_TOPIC', $auth->acl_get('m_move', $forum_id) && $topic_data['topic_status'] != ITEM_MOVED), |