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

…rvey 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

@@ -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)) {