makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2016-09-23 20:55:24 +02:00
commit bbb1ff325b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -20,11 +20,14 @@ matrix:
env: DB=mysqli env: DB=mysqli
- php: 7.0 - php: 7.0
env: DB=mysqli env: DB=mysqli
- php: 7.1
env: DB=mysqli
- php: nightly - php: nightly
env: DB=mysqli env: DB=mysqli
- php: hhvm - php: hhvm
env: DB=mysqli env: DB=mysqli
allow_failures: allow_failures:
- php: 7.1
- php: hhvm - php: hhvm
- php: nightly - php: nightly
fast_finish: true fast_finish: true

2
phpBB/includes/functions.php
View file

@ -841,7 +841,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
$tracking['tf'][$forum_id][$topic_id36] = true; $tracking['tf'][$forum_id][$topic_id36] = true;
} }
$tracking['t'][$topic_id36] = base_convert($post_time - $config['board_startdate'], 10, 36); $tracking['t'][$topic_id36] = base_convert($post_time - (int) $config['board_startdate'], 10, 36);
// If the cookie grows larger than 10000 characters we will remove the smallest value // If the cookie grows larger than 10000 characters we will remove the smallest value
// This can result in old topics being unread - but most of the time it should be accurate... // This can result in old topics being unread - but most of the time it should be accurate...

2
phpBB/phpbb/db/migration/data/v310/timezone.php
View file

@ -103,7 +103,7 @@ class timezone extends \phpbb\db\migration\migration
*/ */
public function convert_phpbb30_timezone($timezone, $dst) public function convert_phpbb30_timezone($timezone, $dst)
{ {
$offset = $timezone + $dst; $offset = (float) $timezone + (int) $dst;
switch ($timezone) switch ($timezone)
{ {

2
phpBB/phpbb/search/base.php
View file

@ -286,7 +286,7 @@ class base
$sql = 'DELETE $sql = 'DELETE
FROM ' . SEARCH_RESULTS_TABLE . ' 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); $db->sql_query($sql);
} }
} }