Merge branch 'release-1.1' of projects.ceondo.com:indefero into develop

This commit is contained in:
Thomas Keller 2011-03-09 13:51:36 +01:00
commit 32d9d04b4b
2 changed files with 4 additions and 2 deletions

View File

@ -50,6 +50,7 @@ function IDF_Migrations_Install_setup($params=null)
'IDF_Scm_Cache_Git',
'IDF_Queue',
'IDF_Gconf',
'IDF_EmailAddress',
);
$db = Pluf::db();
$schema = new Pluf_DB_Schema($db);
@ -107,6 +108,7 @@ function IDF_Migrations_Install_teardown($params=null)
'IDF_Tag',
'IDF_Commit',
'IDF_Project',
'IDF_EmailAddress',
);
$db = Pluf::db();
$schema = new Pluf_DB_Schema($db);
@ -114,4 +116,4 @@ function IDF_Migrations_Install_teardown($params=null)
$schema->model = new $model();
$schema->dropTables();
}
}
}

View File

@ -378,7 +378,7 @@ class IDF_Views
// Count members
$db =& Pluf::db();
$sql = "SELECT count(id) as `nb` FROM indefero_users WHERE first_name != '---'";
$sql = "SELECT count(id) as nb FROM indefero_users WHERE first_name != '---'";
$ret = $db->select ($sql);
$forgestats['members'] = $ret[0]['nb'];