diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-09-23 20:55:21 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-09-23 20:55:21 +0200 |
| commit | 77e14c303023365ec38292ef7518b9fed955929a (patch) | |
| tree | ebd0644accaaa834ff2463c8178b6bf986db0c58 /phpBB/phpbb | |
| parent | bc6dc9f1738109007f0b5ed0b271fc75152ee469 (diff) | |
| parent | becb1e1fff9a5f21ed0378fdc56649f042b7f1eb (diff) | |
| download | forums-77e14c303023365ec38292ef7518b9fed955929a.tar forums-77e14c303023365ec38292ef7518b9fed955929a.tar.gz forums-77e14c303023365ec38292ef7518b9fed955929a.tar.bz2 forums-77e14c303023365ec38292ef7518b9fed955929a.tar.xz forums-77e14c303023365ec38292ef7518b9fed955929a.zip | |
Merge pull request #4457 from rxu/ticket/14793
[ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/timezone.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/search/base.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/timezone.php b/phpBB/phpbb/db/migration/data/v310/timezone.php index 1f6b47ad50..03a8d1ab34 100644 --- a/phpBB/phpbb/db/migration/data/v310/timezone.php +++ b/phpBB/phpbb/db/migration/data/v310/timezone.php @@ -103,7 +103,7 @@ class timezone extends \phpbb\db\migration\migration */ public function convert_phpbb30_timezone($timezone, $dst) { - $offset = $timezone + $dst; + $offset = (float) $timezone + (int) $dst; switch ($timezone) { diff --git a/phpBB/phpbb/search/base.php b/phpBB/phpbb/search/base.php index d9313dddab..56de973b65 100644 --- a/phpBB/phpbb/search/base.php +++ b/phpBB/phpbb/search/base.php @@ -286,7 +286,7 @@ class base $sql = 'DELETE FROM ' . SEARCH_RESULTS_TABLE . ' - WHERE search_time < ' . (time() - $config['search_store_results']); + WHERE search_time < ' . (time() - (int) $config['search_store_results']); $db->sql_query($sql); } } |