Dev: Remove unused variables in _niceExit() and fix surveyid to doFoo…

…ter()
LimeSurvey · Jan 20, 2017 · 459821d · 459821d
1 parent 631dc5a
commit 459821d
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -701,12 +701,11 @@ function _niceExit(&$redata, $iDebugLine, $sTemplateDir = null, $asMessage = arr
 
         if(isset($redata['surveyid']) && $redata['surveyid'] && !isset($thisurvey))
         {
-            $thissurvey=getSurveyInfo($redata['surveyid']);
-            $sTemplateDir= $oTemplate->viewPath;
+            $surveyId = $redata['surveyid'];
         }
         else
         {
-            $sTemplateDir= $oTemplate->viewPath;
+            $surveyId = null;
         }
         sendCacheHeaders();
 
@@ -719,7 +718,7 @@ function _niceExit(&$redata, $iDebugLine, $sTemplateDir = null, $asMessage = arr
         $this->_printMessage($asMessage);
         $this->_printTemplateContent($oTemplate->viewPath.'/endpage.pstpl', $redata, $iDebugLine);
 
-        doFooter($thissurvey['sid']);
+        doFooter($surveyId);  // It's OK for surveyId to be null here
         exit;
     }