mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4752 from nomind60s/ticket/15137

Browse Source 
[ticket/15137] Global Announcements shouldn't always be never ending

* github.com:phpbb/phpbb:
  [ticket/15137] Missed one language string change
  [ticket/15137] Global announcements can stick for a non-zero number of days

fixes #4752
This commit is contained in:
Tristan Darricau
2017-03-21 16:29:10 +01:00
parent bd34b2301e d15b88af2a
commit c9aab0baef
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/viewtopic.php
View File

@@ -323,8 +323,8 @@ if ($post_id)
$topic_id = (int) $topic_data['topic_id'];
$topic_replies = $phpbb_content_visibility->get_count('topic_posts', $topic_data, $forum_id) - 1;
// Check sticky/announcement time limit
if (($topic_data['topic_type'] == POST_STICKY || $topic_data['topic_type'] == POST_ANNOUNCE) && $topic_data['topic_time_limit'] && ($topic_data['topic_time'] + $topic_data['topic_time_limit']) < time())
// Check sticky/announcement/global time limit
if (($topic_data['topic_type'] != POST_NORMAL) && $topic_data['topic_time_limit'] && ($topic_data['topic_time'] + $topic_data['topic_time_limit']) < time())
{
$sql = 'UPDATE ' . TOPICS_TABLE . '
SET topic_type = ' . POST_NORMAL . ', topic_time_limit = 0