From 72b29866b94afa93fecd149b1637e8ef11a362cc Mon Sep 17 00:00:00 2001 From: Olle Haerstedt Date: Tue, 18 Oct 2016 10:13:36 +0200 Subject: [PATCH] Fixed issue #11806: Blank page in conditions --- application/controllers/admin/conditionsaction.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php index 79cbc4cc69b..0f55f474dd4 100644 --- a/application/controllers/admin/conditionsaction.php +++ b/application/controllers/admin/conditionsaction.php @@ -127,9 +127,9 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null) break; } - - if (!empty($request->getPost('subaction'))) { - $subaction = $request->getPost('subaction'); + $postSubaction = $request->getPost('subaction'); + if (!empty($postSubaction)) { + $subaction = $postSubaction; } //BEGIN Sanitizing POSTed data @@ -172,8 +172,9 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null) $p_method = null; } - if (!empty($request->getPost('newscenarionum'))) { - $p_newscenarionum = sanitize_int($request->getPost('newscenarionum')); + $postNewScenarioNum = $request->getPost('newscenarionum'); + if (!empty($postNewScenarioNum)) { + $p_newscenarionum = sanitize_int($postNewScenarioNum); } else { $p_newscenarionum = null; @@ -690,7 +691,8 @@ protected function getMethod() protected function resetSurveyLogic($iSurveyID) { $request = Yii::app()->request; - if (empty($request->get('ok'))) { + $postOk = $request->getQuery('ok'); + if (empty($postOk)) { $data = array('iSurveyID' => $iSurveyID); $content = $this->getController()->renderPartial('/admin/conditions/deleteAllConditions', $data, true); $this->_renderWrappedTemplate('conditions', array('message' => array(