Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source 
Conflicts:
	airtime_mvc/application/models/User.php
This commit is contained in:
Martin Konecny 2012-09-06 12:55:24 -04:00
commit a941743ed7
9 changed files with 145 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/models/User.php
View file

@ -309,13 +309,12 @@ class Application_Model_User
return Application_Common_Database::prepareAndExecute($sql, $params, "all");
}
public static function getUserCount($type=null)
public static function getUserCount()
{
$con = Propel::getConnection();
$sql = '';
$sql_gen = "SELECT count(*) AS cnt FROM cc_subjs";
$query = $con->query($sql)->fetchColumn(0);
$query = $con->query($sql_gen)->fetchColumn(0);
return ($query !== false) ? $query : null;
}