aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-07-03 17:17:00 +0200
committerJoas Schilling <nickvergessen@gmx.de>2015-07-03 17:17:00 +0200
commitf81a2bc7c56cfcb57feaed293be87bbe640dfa5f (patch)
tree3b747b1047d2ad6284585f016ea45884e92f3c66 /phpBB
parentc5f449ad61758576e50fd551302a596c54cbb3e3 (diff)
parent60b4d5132f2023ade224676a6729b5f0847c4110 (diff)
downloadforums-f81a2bc7c56cfcb57feaed293be87bbe640dfa5f.tar
forums-f81a2bc7c56cfcb57feaed293be87bbe640dfa5f.tar.gz
forums-f81a2bc7c56cfcb57feaed293be87bbe640dfa5f.tar.bz2
forums-f81a2bc7c56cfcb57feaed293be87bbe640dfa5f.tar.xz
forums-f81a2bc7c56cfcb57feaed293be87bbe640dfa5f.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/posting.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 121cf3a904..a5060620da 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1338,7 +1338,6 @@ if ($submit || $preview || $refresh)
'enable_urls' => (bool) $post_data['enable_urls'],
'enable_indexing' => (bool) $post_data['enable_indexing'],
'message_md5' => (string) $message_md5,
- 'post_time' => (isset($post_data['post_time'])) ? (int) $post_data['post_time'] : $current_time,
'post_checksum' => (isset($post_data['post_checksum'])) ? (string) $post_data['post_checksum'] : '',
'post_edit_reason' => $post_data['post_edit_reason'],
'post_edit_user' => ($mode == 'edit') ? $user->data['user_id'] : ((isset($post_data['post_edit_user'])) ? (int) $post_data['post_edit_user'] : 0),