diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-08-31 14:57:04 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-08-31 14:57:04 +0000 |
| commit | 139f1d35302fc675b5e972e55c62d36cbc42af5c (patch) | |
| tree | 9618453f34cafc260fbb26883f9a51d01bc072d2 /phpBB/viewtopic.php | |
| parent | d7925595dc46c1d913dd722b2121d4552c20cb47 (diff) | |
| download | forums-139f1d35302fc675b5e972e55c62d36cbc42af5c.tar forums-139f1d35302fc675b5e972e55c62d36cbc42af5c.tar.gz forums-139f1d35302fc675b5e972e55c62d36cbc42af5c.tar.bz2 forums-139f1d35302fc675b5e972e55c62d36cbc42af5c.tar.xz forums-139f1d35302fc675b5e972e55c62d36cbc42af5c.zip | |
fix r10076 for #48615 - Ability to specify amount of time user is able to delete his last post in topic.
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10080 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index eaa17279a2..e7522841e3 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1476,7 +1476,8 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && - // we do not want to allowe removal of the last post if a moderator locked it! + ($row['post_time'] > time() - ($config['delete_time'] * 60) || !$config['delete_time']) && + // we do not want to allow removal of the last post if a moderator locked it! !$row['post_edit_locked'] ))); |