conflicts merged

This commit is contained in:
Rudi Grinberg 2012-09-05 17:51:16 -04:00
commit aa6e061118
2 changed files with 20 additions and 27 deletions

View file

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