From 65152d73f002142607accc081efe09bac2262f3d Mon Sep 17 00:00:00 2001
From: Shubham Sachdeva <ssachdeva@users.sourceforge.net>
Date: Sun, 22 Jan 2012 20:15:03 +0000
Subject: [PATCH] Fixed answer options save. Added an error message in
 dbExecuteAssoc method for debugging purpose.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12160 b72ed6b6-b9f8-46b5-92b4-906544132732
---
 application/helpers/database_helper.php               | 8 ++++++--
 application/helpers/expressions/em_manager_helper.php | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/helpers/database_helper.php b/application/helpers/database_helper.php
index 3455f0fb5a9..593aa964b4a 100644
--- a/application/helpers/database_helper.php
+++ b/application/helpers/database_helper.php
@@ -15,7 +15,7 @@
 */
 function dbExecuteAssoc($sql,$inputarr=false,$silent=false)
 {
-
+    $error = '';
     try {
         if($inputarr)
         {
@@ -27,10 +27,14 @@ function dbExecuteAssoc($sql,$inputarr=false,$silent=false)
 
         }
     } catch(CDbException $e) {
+        $error = $e->getMessage();
         $dataset=false;
     }
 
-    if (!$silent && !$dataset)  { safeDie('Error executing query in dbExecuteAssoc:'.$sql); }
+    if (!$silent && !$dataset)  
+    { 
+        safeDie('Error executing query in dbExecuteAssoc:'.$error); 
+    }
     return $dataset;
 }
 
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
index 39e6d21cdc5..6c48b6ba37d 100644
--- a/application/helpers/expressions/em_manager_helper.php
+++ b/application/helpers/expressions/em_manager_helper.php
@@ -5363,7 +5363,7 @@ public static function UpgradeQuestionAttributes($changeDB=false,$surveyid=NULL,
             // now update the datbase
             foreach ($queries as $query)
             {
-                db_execute_assoc($query);
+                dbExecuteAssoc($query);
             }
             return $queries;
         }