From 42ac1b0d197a5b1b0ad50ff9a6bd43fbe7c07822 Mon Sep 17 00:00:00 2001
From: Paul Arthur <paul.arthur@flowerysong.com>
Date: Tue, 12 Feb 2013 16:41:23 -0500
Subject: Fix User::count()

---
 lib/class/user.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/class')

diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index a9d96506..99b04be2 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -73,7 +73,7 @@ class User extends database_object {
      *
      * This returns the number of user accounts that exist.
      */
-    public function count() {
+    public static function count() {
         $sql = 'SELECT COUNT(`id`) FROM `user`';
         $db_results = Dba::read($sql);
         $data = Dba::fetch_row($db_results);
@@ -81,12 +81,13 @@ class User extends database_object {
 
         $time = time();
         $last_seen = $time - 1200;
-        $sql = 'SELECT COUNT(DISTINCT `session`.`username) FROM `session` ' .
+        $sql = 'SELECT COUNT(DISTINCT `session`.`username`) FROM `session` ' .
             'INNER JOIN `user` ON `session`.`username` = `user`.`username` ' .
             'WHERE `session`.`expire` > ? and `user`.`last_seen` > ?';
         $db_results = Dba::read($sql, array($time, $last_seen));
         $data = Dba::fetch_row($db_results);
         $results['connected'] = $data[0];
+        return $results;
     }
 
     /**
-- 
cgit