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

Conflicts:
	airtime_mvc/application/common/Database.php
This commit is contained in:
denise 2012-09-05 17:55:26 -04:00
commit 78c81aa434
3 changed files with 26 additions and 17 deletions

View file

@ -1,8 +1,8 @@
<?php
class Application_Common_Database
{
public static function prepareAndExecute($sql, $paramValueMap, $type='all', $fetchType=PDO::FETCH_ASSOC){
public static function prepareAndExecute($sql, $paramValueMap, $type='all', $fetchType=PDO::FETCH_ASSOC)
{
$con = Propel::getConnection();
$stmt = $con->prepare($sql);
foreach ($paramValueMap as $param => $v) {