diff options
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v320/notifications_board.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/user.php | 2 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v320/notifications_board.php b/phpBB/phpbb/db/migration/data/v320/notifications_board.php index 8a76ebab58..ac1b3a0f2c 100644 --- a/phpBB/phpbb/db/migration/data/v320/notifications_board.php +++ b/phpBB/phpbb/db/migration/data/v320/notifications_board.php @@ -34,7 +34,7 @@ class notifications_board extends \phpbb\db\migration\migration public function update_module() { $sql = 'UPDATE ' . MODULES_TABLE . " - SET auth = 'cfg_allow_board_notifications' + SET module_auth = 'cfg_allow_board_notifications' WHERE module_basename = 'ucp_notifications' AND module_mode = 'notification_list'"; $this->sql_query($sql); diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 5262e10e87..305510851c 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -595,7 +595,7 @@ class user extends \phpbb\session $utc = new \DateTimeZone('UTC'); } - $time = new $this->datetime($this, "@$gmepoch", $utc); + $time = new $this->datetime($this, '@' . (int) $gmepoch, $utc); $time->setTimezone($this->timezone); return $time->format($format, $forcedate); diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 52023359dd..a2ab4d56f5 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -311,7 +311,10 @@ if ($sort_days) 'sql_array', ); extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_sort_data_sql', compact($vars))); + $result = $db->sql_query($db->sql_build_query('SELECT', $sql_array)); + $topics_count = (int) $db->sql_fetchfield('num_topics'); + $db->sql_freeresult($result); if (isset($_POST['sort'])) { |