makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2446 from nickvergessen/ticket/12518

Browse source 
[ticket/12518] Apply De Morgan to make the conditions easier reasable

* nickvergessen/ticket/12518:
  [ticket/12518] Apply De Morgan to make the conditions easier to read
This commit is contained in:
Andreas Fischer 2014-05-12 01:10:30 +02:00
commit bfacf2d6eb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/posting.php
View file

@ -384,7 +384,7 @@ if ($mode == 'edit' && !$auth->acl_get('m_edit', $forum_id))
$force_edit_allowed = false; $force_edit_allowed = false;
$s_cannot_edit = $user->data['user_id'] != $post_data['poster_id']; $s_cannot_edit = $user->data['user_id'] != $post_data['poster_id'];
$s_cannot_edit_time = !($post_data['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time']); $s_cannot_edit_time = $config['edit_time'] && $post_data['post_time'] <= time() - ($config['edit_time'] * 60);
$s_cannot_edit_locked = $post_data['post_edit_locked']; $s_cannot_edit_locked = $post_data['post_edit_locked'];
/** /**

4
phpBB/viewtopic.php
View file

@ -1585,7 +1585,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
$force_edit_allowed = $force_delete_allowed = false; $force_edit_allowed = $force_delete_allowed = false;
$s_cannot_edit = !$auth->acl_get('f_edit', $forum_id) || $user->data['user_id'] != $poster_id; $s_cannot_edit = !$auth->acl_get('f_edit', $forum_id) || $user->data['user_id'] != $poster_id;
$s_cannot_edit_time = !($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time']); $s_cannot_edit_time = $config['edit_time'] && $row['post_time'] <= time() - ($config['edit_time'] * 60);
$s_cannot_edit_locked = $topic_data['topic_status'] == ITEM_LOCKED || $row['post_edit_locked']; $s_cannot_edit_locked = $topic_data['topic_status'] == ITEM_LOCKED || $row['post_edit_locked'];
$s_cannot_delete = $user->data['user_id'] != $poster_id || ( $s_cannot_delete = $user->data['user_id'] != $poster_id || (
@ -1593,7 +1593,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
(!$auth->acl_get('f_softdelete', $forum_id) || $row['post_visibility'] == ITEM_DELETED) (!$auth->acl_get('f_softdelete', $forum_id) || $row['post_visibility'] == ITEM_DELETED)
); );
$s_cannot_delete_lastpost = $topic_data['topic_last_post_id'] != $row['post_id']; $s_cannot_delete_lastpost = $topic_data['topic_last_post_id'] != $row['post_id'];
$s_cannot_delete_time = !($row['post_time'] > time() - ($config['delete_time'] * 60) || !$config['delete_time']); $s_cannot_delete_time = $config['delete_time'] && $row['post_time'] <= time() - ($config['delete_time'] * 60);
// we do not want to allow removal of the last post if a moderator locked it! // we do not want to allow removal of the last post if a moderator locked it!
$s_cannot_delete_locked = $topic_data['topic_status'] == ITEM_LOCKED || $row['post_edit_locked']; $s_cannot_delete_locked = $topic_data['topic_status'] == ITEM_LOCKED || $row['post_edit_locked'];