Dev: removed $bStartSurvey from controllers

LimeSurvey · May 10, 2017 · 6170838 · 6170838
1 parent 7142424
commit 6170838
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/application/controllers/PrintanswersController.php b/application/controllers/PrintanswersController.php
@@ -28,8 +28,6 @@ class PrintanswersController extends LSYii_Controller {
     public $aReplacementData= array();
     /* @var array Global data when use templatereplace function  in layout, @see templatereplace $redata */
     public $aGlobalData= array();
-    /* @var boolean did we need survey.pstpl when using layout */
-    public $bStartSurvey= false;
 
 
         /**

diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
@@ -29,8 +29,7 @@ class RegisterController extends LSYii_Controller {
     public $aReplacementData= array();
     /* @var array Global data when use templatereplace function  in layout, @see templatereplace $redata */
     public $aGlobalData= array();
-    /* @var boolean did we need survey.pstpl when using layout */
-    public $bStartSurvey= true;
+
 
     /**
     * The array of errors to be displayed

diff --git a/application/controllers/SurveyController.php b/application/controllers/SurveyController.php
@@ -23,8 +23,7 @@ class SurveyController extends LSYii_Controller
     public $aReplacementData= array();
     /* @var array Global data when use templatereplace function  in layout, @see templatereplace $redata */
     public $aGlobalData= array();
-    /* @var boolean did we need survey.pstpl when using layout */
-    public $bStartSurvey= false;
+
     /**
      * Initialises this controller, does some basic checks and setups
      *

diff --git a/application/controllers/SurveysController.php b/application/controllers/SurveysController.php
@@ -14,8 +14,6 @@ class SurveysController extends LSYii_Controller
         public $aReplacementData= array();
         /* @var array Global data when use templatereplace function  in layout, @see templatereplace $redata */
         public $aGlobalData= array();
-        /* @var boolean did we need survey.pstpl when using layout */
-        public $bStartSurvey= false;
 
         public $defaultAction = 'publicList';
 

diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -1887,7 +1887,7 @@ private function setGroup()
 
         if ( !$this->previewgrp && !$this->previewquestion)
         {
-            if (($show_empty_group) || !isset($_SESSION[$LEMsessid]['grouplist'])){
+            if (($this->show_empty_group) || !isset($_SESSION[$LEMsessid]['grouplist'])){
                 $this->gid              = -1; // Make sure the gid is unused. This will assure that the foreach (fieldarray as ia) has no effect.
                 $this->groupname        = gT("Submit your answers");
                 $this->groupdescription = gT("There are no more questions. Please press the <Submit> button to finish this survey.");