Fixed issue #6637: default template settings aren't used with endpage…

….pstpl for surveylist Dev : other_replace_text aren't used for other_comment_mandatory, need more works for i18n
LimeSurvey · Oct 4, 2012 · a6d40f4 · a6d40f4
1 parent f9693c9
commit a6d40f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -305,7 +305,7 @@ function sendreq(surveyid)
             }
             </script>';
 
-            $this->_printTemplateContent(Yii::app()->getConfig("standardtemplaterootdir").DIRECTORY_SEPARATOR.'default'.DIRECTORY_SEPARATOR.'endpage.pstpl', $redata, __LINE__);
+            $this->_printTemplateContent(getTemplatePath(Yii::app()->getConfig("defaulttemplate"))."/endpage.pstpl", $data, __LINE__);
             doFooter();
             exit;
         }

diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -2579,8 +2579,8 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
                 // other comment mandatory
                 if ($other_comment_mandatory!='')
                 {
-                    if (isset($_qattr['other_replace_text']) && flattenText($_qattr['other_replace_text']) != '') {
-                        $othertext = flattenText($_qattr['other_replace_text']);
+                    if (isset($qattr['other_replace_text']) && trim($qattr['other_replace_text']) != '') {
+                        $othertext = trim($qattr['other_replace_text']);
                     }
                     else {
                         $othertext = $this->gT('other');