Fixed issue #9457: Error in integrity check when using MSSQL

LimeSurvey · Aug 24, 2015 · 114bb97 · 114bb97
1 parent 5821f3d
commit 114bb97
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/application/controllers/admin/checkintegrity.php b/application/controllers/admin/checkintegrity.php
@@ -252,7 +252,7 @@ private function _deleteQuotaMembers(array $aData)
 
     /**
     * This function Deletes quota language settings without related main entries
-    * 
+    *
     */
     private function _deleteQuotaLanguageSettings()
     {
@@ -265,8 +265,8 @@ private function _deleteQuotaLanguageSettings()
 
     /**
     * This function deletes quota entries which not having a related survey entry
-    * 
-    * @param mixed $aData 
+    *
+    * @param mixed $aData
     */
     private function _deleteQuotas(array $aData)
     {
@@ -359,6 +359,8 @@ protected function _checkintegrity()
         $sDBPrefix = Yii::app()->db->tablePrefix;
         $sQuery = dbSelectTablesLike('{{survey}}\_%');
         $aResult = dbQueryOrFalse($sQuery);
+        $sSurveyIDs = Yii::app()->db->createCommand('select sid from {{surveys}}')->queryColumn();
+
         foreach ($aResult->readAll() as $aRow)
         {
             $sTableName = substr(reset($aRow), strlen($sDBPrefix));
@@ -367,7 +369,7 @@ protected function _checkintegrity()
             if (isset($aTableName[1]) && ctype_digit($aTableName[1]))
             {
                 $iSurveyID = $aTableName[1];
-                if (!in_array($iSurveyID, $sids)) {
+                if (!in_array($iSurveyID, $sSurveyIDs)) {
                     $sDate = date('YmdHis') . rand(1, 1000);
                     $sOldTable = "survey_{$iSurveyID}";
                     $sNewTable = "old_survey_{$iSurveyID}_{$sDate}";
@@ -386,7 +388,7 @@ protected function _checkintegrity()
         {
             $sTableName = substr(reset($aRow), strlen($sDBPrefix));
             $iSurveyID = substr($sTableName, strpos($sTableName, '_') + 1);
-            if (!in_array($iSurveyID, $sids)) {
+            if (!in_array($iSurveyID, $sSurveyIDs)) {
                 $sDate = date('YmdHis') . rand(1, 1000);
                 $sOldTable = "tokens_{$iSurveyID}";
                 $sNewTable = "old_tokens_{$iSurveyID}_{$sDate}";