diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-15 18:40:43 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-15 18:40:43 +0200 |
| commit | 3521dfc2787a532365dba12eec669579d15d79f2 (patch) | |
| tree | 9e606800cdde4e3051ed8eae0685afdc4b8c1929 /phpBB/phpbb/notification | |
| parent | 40932c26eaa7cddd0731b136a77c9bad704b69e0 (diff) | |
| parent | a35721f68c95153f46dd67ea465addedf82f538e (diff) | |
| download | forums-3521dfc2787a532365dba12eec669579d15d79f2.tar forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.gz forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.bz2 forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.xz forums-3521dfc2787a532365dba12eec669579d15d79f2.zip | |
Merge remote-tracking branch 'p/prep-release-3.1.0-a1' into develop
* p/prep-release-3.1.0-a1:
[prep-release-3.1.0-a1] Update changelog with the latest changes
[ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
[ticket/11918] Make sql_freeresult() consistent across all DB drivers
[prep-release-3.1.0-a1] Only build packages for the latest olympus versions
[prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes
[prep-release-3.1.0-a1] Update version to 3.1.0-a1
Diffstat (limited to 'phpBB/phpbb/notification')
| -rw-r--r-- | phpBB/phpbb/notification/manager.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index c42c84fb1f..b92b247c74 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -154,7 +154,7 @@ class manager AND nt.notification_type_id = n.notification_type_id AND nt.notification_type_enabled = 1'; $result = $this->db->sql_query($sql); - $unread_count = (int) $this->db->sql_fetchfield('unread_count', $result); + $unread_count = (int) $this->db->sql_fetchfield('unread_count'); $this->db->sql_freeresult($result); } @@ -167,7 +167,7 @@ class manager AND nt.notification_type_id = n.notification_type_id AND nt.notification_type_enabled = 1'; $result = $this->db->sql_query($sql); - $total_count = (int) $this->db->sql_fetchfield('total_count', $result); + $total_count = (int) $this->db->sql_fetchfield('total_count'); $this->db->sql_freeresult($result); } |