Dev: refined updatecontroller not to load general layout.

LimeSurvey · Dec 28, 2017 · 1203bc0 · 1203bc0
1 parent 2bced78
commit 1203bc0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/application/controllers/admin/databaseupdate.php b/application/controllers/admin/databaseupdate.php
@@ -44,6 +44,7 @@ public function db($continue = null)
             $aViewUrls['output'] = CheckForDBUpgrades();
         }
 
+
         $aData['updatedbaction'] = true;
 
         $this->_renderWrappedTemplate('update', $aViewUrls, $aData, 'layout_minimal.php');

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -315,7 +315,7 @@ private function renderCentralContents($sAction, $aViewUrls, $aData = [])
      * @param array|string $aViewUrls View url(s)
      * @param array $aData Data to be passed on. Optional.
      */
-    protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $aData = array(), $sRenderFile = false);
+    protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $aData = array(), $sRenderFile = false)
     {
         // Gather the data
         $aData = $this->_addPseudoParams($aData); //// the check of the surveyid should be done in the Admin controller it self.
@@ -330,7 +330,7 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $
                 $renderFile = $basePath.'/layout_main.php';
             }
         } else {
-            $renderFile = $basePath.$sRenderFile;
+            $renderFile = $basePath.'/'.$sRenderFile;
         }
 
         $content = $this->renderCentralContents($sAction, $aViewUrls, $aData);

diff --git a/application/views/admin/super/_tutorial_menu.php b/application/views/admin/super/_tutorial_menu.php
@@ -1,9 +1,5 @@
 <?php
-try{
-    $aTutorials = @Tutorials::model()->getActiveTutorials();
-} catch(Exception $e){
-    $aTutorials = [];
-}
+    $aTutorials = Tutorials::model()->getActiveTutorials();
 ?>
 
 <li class="dropdown">