diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-10-05 15:40:24 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-10-05 15:40:24 +0200 |
| commit | 9c91bc49762c36f7b463bf7e0660e84e80343c6e (patch) | |
| tree | 6d2eb6e269f02433c5b6a580dce76254b9e88f44 | |
| parent | e1ae3236b27953ab0ea9e4543ba2f96d5ce8d3ab (diff) | |
| parent | f79b7f189663fcdf1e70331d3129eeb80b45bfb1 (diff) | |
| download | forums-9c91bc49762c36f7b463bf7e0660e84e80343c6e.tar forums-9c91bc49762c36f7b463bf7e0660e84e80343c6e.tar.gz forums-9c91bc49762c36f7b463bf7e0660e84e80343c6e.tar.bz2 forums-9c91bc49762c36f7b463bf7e0660e84e80343c6e.tar.xz forums-9c91bc49762c36f7b463bf7e0660e84e80343c6e.zip | |
Merge pull request #4967 from Leinad4Mind/3.2.x
[PHPBB3-14629] round() the log() explicitly to a proper integer
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/feed/topics_active.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index e044384c9f..77e6133fe6 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -552,7 +552,7 @@ class acp_board if ($config_name == 'allow_quick_reply' && isset($_POST['allow_quick_reply_enable'])) { - enable_bitfield_column_flag(FORUMS_TABLE, 'forum_flags', log(FORUM_FLAG_QUICK_REPLY, 2)); + enable_bitfield_column_flag(FORUMS_TABLE, 'forum_flags', round(log(FORUM_FLAG_QUICK_REPLY, 2))); } } } diff --git a/phpBB/phpbb/feed/topics_active.php b/phpBB/phpbb/feed/topics_active.php index 7ae0bde56b..ea9ee97b9d 100644 --- a/phpBB/phpbb/feed/topics_active.php +++ b/phpBB/phpbb/feed/topics_active.php @@ -119,7 +119,7 @@ class topics_active extends topic_base FROM ' . FORUMS_TABLE . ' WHERE forum_type = ' . FORUM_POST . ' AND ' . $this->db->sql_bit_and('forum_options', FORUM_OPTION_FEED_EXCLUDE, '= 0') . ' - AND ' . $this->db->sql_bit_and('forum_flags', log(FORUM_FLAG_ACTIVE_TOPICS, 2), '<> 0'); + AND ' . $this->db->sql_bit_and('forum_flags', round(log(FORUM_FLAG_ACTIVE_TOPICS, 2)), '<> 0'); $result = $this->db->sql_query($sql); $forum_ids = array(); |