Fixed #6961: CDbException unbuffered queries active when accessing su…

…rvey or db analysis
LimeSurvey · Nov 26, 2012 · e107984 · e107984
1 parent 87836a6
commit e107984
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -488,6 +488,7 @@ function sendreq(surveyid)
             }
             $tkresult = dbExecuteAssoc($tkquery); //Checked
             $tokendata = $tkresult->read();
+            $tkresult->close(); //Close the result in case there are more result rows, we are only interested in one and don't want unbuffered query errors
             if (isset($tokendata['validfrom']) && (trim($tokendata['validfrom'])!='' && $tokendata['validfrom']>dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", $timeadjust)) ||
             isset($tokendata['validuntil']) && (trim($tokendata['validuntil'])!='' && $tokendata['validuntil']<dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", $timeadjust)))
             {

diff --git a/application/helpers/database_helper.php b/application/helpers/database_helper.php
@@ -13,6 +13,14 @@
 *
 *	$Id$
 */
+
+/**
+ * 
+ * @param type $sql
+ * @param type $inputarr
+ * @param type $silent
+ * @return CDbDataReader
+ */
 function dbExecuteAssoc($sql,$inputarr=false,$silent=true)
 {
     $error = '';