From 160c5d25368c4a73c7b8635d26e6f63c34459cc2 Mon Sep 17 00:00:00 2001
From: Menno Dekker <mennodekker@users.sourceforge.net>
Date: Mon, 26 Nov 2012 21:31:06 +0100
Subject: [PATCH] fixed #6961: CDbException unbuffered queries active when
 accessing survey or db analysis dev: seems that i only needed to remove old
 code that should have been removed anyway... merge error?

---
 application/controllers/admin/checkintegrity.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/application/controllers/admin/checkintegrity.php b/application/controllers/admin/checkintegrity.php
index 90d249de8e3..6c213c69231 100644
--- a/application/controllers/admin/checkintegrity.php
+++ b/application/controllers/admin/checkintegrity.php
@@ -637,8 +637,8 @@ protected function _checkintegrity()
             $aFullOldSIDs[$iSurveyID][] = $sTable;
         }
         $aOldSIDs = array_unique($aOldSIDs);
-        $sQuery = 'SELECT sid FROM {{surveys}} ORDER BY sid';
-        $oResult = dbExecuteAssoc($sQuery) or safeDie('Couldn\'t get unique survey ids');
+        //$sQuery = 'SELECT sid FROM {{surveys}} ORDER BY sid';
+        //$oResult = dbExecuteAssoc($sQuery) or safeDie('Couldn\'t get unique survey ids');
         $surveys = Survey::model()->findAll();
         if (Survey::model()->hasErrors()) safeDie(Survey::model()->getError());
         $aSIDs = array();
@@ -718,10 +718,6 @@ protected function _checkintegrity()
         {
             $aSIDs[] = $survey['sid'];
         }
-        foreach ($oResult->readAll() as $aRow)
-        {
-            $aTokenSIDs[] = $aRow['sid'];
-        }
         foreach ($aOldTokenSIDs as $iOldTokenSID)
         {
             if (!in_array($iOldTokenSID, $aTokenSIDs)) {