diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-24 08:54:50 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-24 08:54:50 +0200 |
| commit | 510f704bc82900c6408e55bf7240aec5d29b9f42 (patch) | |
| tree | 50039d039db24e38aa5ed31769f2acec4d4f6961 /phpBB/includes/functions_posting.php | |
| parent | 58b40945b0ec8b32f28e622186c99618b5e26f10 (diff) | |
| parent | 84bbd4490e853f9dd971f9da56210c3801cb8205 (diff) | |
| download | forums-510f704bc82900c6408e55bf7240aec5d29b9f42.tar forums-510f704bc82900c6408e55bf7240aec5d29b9f42.tar.gz forums-510f704bc82900c6408e55bf7240aec5d29b9f42.tar.bz2 forums-510f704bc82900c6408e55bf7240aec5d29b9f42.tar.xz forums-510f704bc82900c6408e55bf7240aec5d29b9f42.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 2ba1ee7002..a1ace42c32 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1552,7 +1552,14 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u return false; } - $current_time = time(); + if (!empty($data['post_time'])) + { + $current_time = $data['post_time']; + } + else + { + $current_time = time(); + } if ($mode == 'post') { |