diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php index 82c890b71f8..c70f39ef22d 100644 --- a/application/controllers/admin/questions.php +++ b/application/controllers/admin/questions.php @@ -1289,15 +1289,13 @@ public function index($sa, $surveyid, $gid, $qid = null) $aData['action'] = $action; - $sumresult1 = Survey::model()->findByPk($surveyid); - if (is_null($sumresult1)) { + $arSurveyInfo = Survey::model()->findByPk($surveyid); + if (is_null($arSurveyInfo)) { $this->getController()->error('Invalid Survey ID'); } - // $surveyinfo = $sumresult1->attributes; - // $surveyinfo = array_map('flattenText', $surveyinfo); - $aData['activated'] = $activated = $sumresult1->active; - + $aData['activated'] = $arSurveyInfo->active; + // Prepare selector Class for javascript function if (Yii::app()->session['questionselectormode'] !== 'default') { $selectormodeclass = Yii::app()->session['questionselectormode']; @@ -1318,7 +1316,7 @@ public function index($sa, $surveyid, $gid, $qid = null) if ($adding) { // Get the questions for this group - $baselang = Survey::model()->findByPk($surveyid)->language; + $baselang = $arSurveyInfo->language; $oqresult = Question::model()->findAllByAttributes(array('sid' => $surveyid, 'gid' => $gid, 'language' => $baselang, 'parent_qid'=> 0), array('order' => 'question_order')); $aData['oqresult'] = $oqresult; }