diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-03-25 16:37:33 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-03-25 16:37:33 +0100 |
| commit | 936426178b8dcb13233b81946d43afb5f91149d2 (patch) | |
| tree | 7dbe1ded870263bee565e6b6d37baa02413cf478 | |
| parent | bf6822ed1b327b902bb689380ffe4277b52b75b2 (diff) | |
| parent | 38cf5c10f91b4af6f22059185f758a1da8e7d04e (diff) | |
| download | forums-936426178b8dcb13233b81946d43afb5f91149d2.tar forums-936426178b8dcb13233b81946d43afb5f91149d2.tar.gz forums-936426178b8dcb13233b81946d43afb5f91149d2.tar.bz2 forums-936426178b8dcb13233b81946d43afb5f91149d2.tar.xz forums-936426178b8dcb13233b81946d43afb5f91149d2.zip | |
Merge pull request #4762 from Nicofuma/ticket/15137
[ticket/15137] Global Announcements shouldn't always be never ending
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 0edf9304a3..7bc9608536 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1676,7 +1676,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data 'topic_first_poster_name' => (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''), 'topic_first_poster_colour' => $user->data['user_colour'], 'topic_type' => $topic_type, - 'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data_ary['topic_time_limit'] * 86400) : 0, + 'topic_time_limit' => $topic_type != POST_NORMAL ? ($data_ary['topic_time_limit'] * 86400) : 0, 'topic_attachment' => (!empty($data_ary['attachment_data'])) ? 1 : 0, 'topic_status' => (isset($data_ary['topic_status'])) ? $data_ary['topic_status'] : ITEM_UNLOCKED, ); @@ -1771,7 +1771,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data 'topic_title' => $subject, 'topic_first_poster_name' => $username, 'topic_type' => $topic_type, - 'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data_ary['topic_time_limit'] * 86400) : 0, + 'topic_time_limit' => $topic_type != POST_NORMAL ? ($data_ary['topic_time_limit'] * 86400) : 0, 'poll_title' => (isset($poll_ary['poll_options'])) ? $poll_ary['poll_title'] : '', 'poll_start' => (isset($poll_ary['poll_options'])) ? $poll_start : 0, 'poll_max_options' => (isset($poll_ary['poll_options'])) ? $poll_ary['poll_max_options'] : 1, |