Dev: Revert some breaking changes in export (SurveyObj IS NOT Survey …

…model)
LimeSurvey · Dec 28, 2017 · 7b14e20 · 7b14e20
1 parent 961311b
commit 7b14e20
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/application/helpers/admin/export/SurveyDao.php b/application/helpers/admin/export/SurveyDao.php
@@ -95,17 +95,17 @@ public function loadSurveyById($id, $lang = null)
      */
     public function loadSurveyResults(SurveyObj $survey, $iMinimum, $iMaximum, $sFilter = '', $completionState = 'all', $aFields = array(), $aResponsesId = array())
     {
-
+        $responsesTableName = '{{survey_' . $survey->id . '}}';
         $aSelectFields = Yii::app()->db->schema->getTable('{{survey_'.$survey->id.'}}')->getColumnNames();
         // Get info about the survey
         if (!empty($aFields)) {
             $aSelectFields = array_intersect($aFields, $aSelectFields);
         }
         // Allways add Table prefix : see bug #08396 . Don't use array_walk for PHP < 5.3 compatibility
         foreach ($aSelectFields as &$sField) {
-            $sField = $survey->responsesTableName.".".$sField;
+            $sField = $responsesTableName.".".$sField;
         }
-        $oRecordSet = Yii::app()->db->createCommand()->from($survey->responsesTableName);
+        $oRecordSet = Yii::app()->db->createCommand()->from($responsesTableName);
         if (tableExists('tokens_'.$survey->id) && array_key_exists('token', SurveyDynamic::model($survey->id)->attributes) && Permission::model()->hasSurveyPermission($survey->id, 'tokens', 'read')) {
             $oRecordSet->leftJoin($survey->tokensTableName.' tokentable', 'tokentable.token='.$survey->tokensTableName.'.token');
             $aTokenFields = Yii::app()->db->schema->getTable($survey->tokensTableName)->getColumnNames();
@@ -117,8 +117,8 @@ public function loadSurveyResults(SurveyObj $survey, $iMinimum, $iMaximum, $sFil
             //$aSelectFields[]='{{survey_' . $survey->id . '}}.token';
         }
         if ($survey->info['savetimings'] == "Y") {
-            $oRecordSet->leftJoin($survey->timi." survey_timings", $survey->responsesTableName.".id = survey_timings.id");
-            $aTimingFields = Yii::app()->db->schema->getTable($survey->hasTimingsTable)->getColumnNames();
+            $oRecordSet->leftJoin("{{survey_" . $survey->id . "_timings}} survey_timings", "{{survey_" . $survey->id . "}}.id = survey_timings.id");
+            $aTimingFields=Yii::app()->db->schema->getTable("{{survey_" . $survey->id . "_timings}}")->getColumnNames();
             foreach ($aTimingFields as &$sField) {
                             $sField = "survey_timings.".$sField;
             }
@@ -131,7 +131,7 @@ public function loadSurveyResults(SurveyObj $survey, $iMinimum, $iMaximum, $sFil
             'min'=>$iMinimum,
             'max'=>$iMaximum
         );
-        $selection = $survey->responsesTableName.'.id >= :min AND '.$survey->responsesTableName.'.id <= :max';
+        $selection = $responsesTableName.'.id >= :min AND '.$responsesTableName.'.id <= :max';
         $oRecordSet->where($selection, $aParams);
 
         if (empty($aResponsesId)) {
@@ -178,7 +178,7 @@ public function loadSurveyResults(SurveyObj $survey, $iMinimum, $iMaximum, $sFil
                 // Do nothing, all responses
                 break;
         }
-        $oRecordSet->order = $survey->responsesTableName.'.id ASC';
+        $oRecordSet->order = $responsesTableName.'.id ASC';
         $survey->responses = $oRecordSet->select($aSelectFields)->query();
     }
 }