Merge branch '3.1.x'

This commit is contained in:
Marc Alexander 2015-06-24 08:54:50 +02:00
commit 510f704bc8

View file

@ -1552,7 +1552,14 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
return false; return false;
} }
$current_time = time(); if (!empty($data['post_time']))
{
$current_time = $data['post_time'];
}
else
{
$current_time = time();
}
if ($mode == 'post') if ($mode == 'post')
{ {