Fixed issue #11806: Blank page in conditions

LimeSurvey · Oct 18, 2016 · 72b2986 · 72b2986
1 parent 62fb627
commit 72b2986
Showing 1 changed file with 8 additions and 6 deletions.
diff --git 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(