Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

2013-05-27 15:35:06 -04:00 · 2013-05-27 15:35:06 -04:00 · 1c452988cf
commit 1c452988cf
parent 90ad62e4f9 5ba72d00bc
9 changed files with 81 additions and 43 deletions
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@ -40,7 +40,7 @@ class Application_Model_Preference

            $result = Application_Common_Database::prepareAndExecute($sql, 
                    $paramMap, 
-                    'column', 
+                    Application_Common_Database::COLUMN,
                    PDO::FETCH_ASSOC, 
                    $con);