Fixed issue: theme breaks when filepath inside the config includes li…

…nebreaks and empty spaces
LimeSurvey · Sep 20, 2023 · ef2e695 · ef2e695
1 parent 2fae78e
commit ef2e695
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/application/models/TemplateManifest.php b/application/models/TemplateManifest.php
@@ -71,7 +71,9 @@ public function getValidScreenFiles($sType = "view", $sScreen = null)
 
         foreach ($filesFromXML as $file) {
             if ($file->attributes()->type == $sType) {
-                $aScreenFiles[] = (string) $file;
+                // prevent accidental linebreaks and empty spaces in xml file string from breaking file path when loading it
+                $file = trim(str_replace(["\r", "\n"], '', $file));
+                $aScreenFiles[] = $file;
             }
         }
 

diff --git a/themes/survey/fruity_twentythree/config.xml b/themes/survey/fruity_twentythree/config.xml
@@ -190,10 +190,8 @@
                     <file type="view" role="subview">./subviews/survey/group_subviews/group_name.twig</file>
                     <file type="view" role="subview">./subviews/survey/question.twig</file>
                     <file type="view" role="subview">./subviews/survey/question_container.twig</file>
-                    <file type="view" role="subview">./subviews/survey/question_subviews/question_text_container.twig
-                    </file>
-                    <file type="view" role="subview">./subviews/survey/question_subviews/question_text_content.twig
-                    </file>
+                    <file type="view" role="subview">./subviews/survey/question_subviews/question_text_container.twig</file>
+                    <file type="view" role="subview">./subviews/survey/question_subviews/question_text_content.twig</file>
                     <file type="view" role="subview">./subviews/survey/question_subviews/answers.twig</file>
                     <file type="view" role="subview">./subviews/survey/question_subviews/survey_question_help.twig</file>
                     <file type="view" role="subview">./subviews/survey/question_subviews/valid_message_and_help.twig</file>