aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-10-15 15:41:09 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-10-15 15:41:09 +0200
commit532b124115162c94b989834e1b889982d5f4d3ef (patch)
tree3fc536ebef91f3b0cdb3d4863813f4b508f683ce
parent8dc824d4b363ee21bad3b6a7f53fa57b73763a52 (diff)
parent2b1ee16e4fa859ade2160910c529f59ddd1db697 (diff)
downloadforums-532b124115162c94b989834e1b889982d5f4d3ef.tar
forums-532b124115162c94b989834e1b889982d5f4d3ef.tar.gz
forums-532b124115162c94b989834e1b889982d5f4d3ef.tar.bz2
forums-532b124115162c94b989834e1b889982d5f4d3ef.tar.xz
forums-532b124115162c94b989834e1b889982d5f4d3ef.zip
Merge remote-tracking branch 'noxwizard/ticket/11919' into prep-release-3.1.0-a1
* noxwizard/ticket/11919: [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
-rw-r--r--phpBB/phpbb/notification/manager.php4
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);
}