Dev Reverted rev 11278 - jasebo, please get in touch with me

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@11283 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 27, 2011 · b262be1 · b262be1
1 parent 53503bd
commit b262be1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/application/controllers/survey.php b/application/controllers/survey.php
@@ -185,7 +185,7 @@ function action()
                 doHeader();
 
                 $redata = compact(array_keys(get_defined_vars()));
-                $this->_printTemplateContent($this->config->item("standardtemplaterootdir").'/startpage.pstpl', $redata, __LINE__);
+                $this->_printTemplateContent($this->config->item("standardtemplaterootdir").'/default/startpage.pstpl', $redata, __LINE__);
                 $asMessage = array(
                         $clang->gT("Error"),
                         $clang->gT("We are sorry but you don't have permissions to do this."),
@@ -219,7 +219,7 @@ function action()
             doHeader();
 
             $redata = compact(array_keys(get_defined_vars()));
-            $this->_printTemplateContent($this->config->item("standardtemplaterootdir").'/startpage.pstpl', $redata, __LINE__);
+            $this->_printTemplateContent($this->config->item("standardtemplaterootdir").'/default/startpage.pstpl', $redata, __LINE__);
             $asMessage = array(
                     $clang->gT("Error"),
                     $clang->gT("We are sorry but your session has expired."),
@@ -1065,7 +1065,7 @@ function _killPage(&$redata, $iDebugLine, $sTemplateDir = null, $asMessage = arr
         if ( $sTemplateDir == null )
             $sTemplateDir = $this->config->item("standardtemplaterootdir");
 
-        $this->_printTemplateContent($sTemplateDir.'/endpage.pstpl', $redata, $iDebugLine);
+        $this->_printTemplateContent($sTemplateDir.'/default/endpage.pstpl', $redata, $iDebugLine);
         doFooter();
         if ( $bKillSession )
             killSession();
@@ -1084,7 +1084,7 @@ function _createNewUserSessionAndRedirect($surveyId, &$redata, $asMessage = arra
         sendcacheheaders();
         doHeader();
 
-        $template = $this->config->item("standardtemplaterootdir").'/startpage.pstpl';
+        $template = $this->config->item("standardtemplaterootdir").'/default/startpage.pstpl';
         $this->_printTemplateContent($template, $redata, __LINE__);
 
         $this->_killPage($redata, __LINE__, null, $asMessage);