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

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

Conflicts:
	airtime_mvc/application/common/Database.php
This commit is contained in:
Martin Konecny 2012-09-05 17:45:13 -04:00
parent 139950fac2 3894990975
commit 0ae1b9fea6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/common/Database.php
View File

@ -1,5 +1,7 @@
<?php <?php
class Application_Common_Database{ class Application_Common_Database
{
public static function prepareAndExecute($sql, $paramValueMap, $type='all') public static function prepareAndExecute($sql, $paramValueMap, $type='all')
{ {
$con = Propel::getConnection(); $con = Propel::getConnection();