Fixed issue #09609: Template with dash (-) in the name cannot be used…

… as default site template Dev: use same filter than Survey->tplfilter Dev: todo : review filtering in 2.06
LimeSurvey · Apr 21, 2015 · 35d2803 · 35d2803
1 parent fe12c14
commit 35d2803
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/application/controllers/admin/globalsettings.php b/application/controllers/admin/globalsettings.php
@@ -158,7 +158,12 @@ private function _saveSettings()
         setGlobalSetting('defaulttemplateeditormode', sanitize_paranoid_string($_POST['defaulttemplateeditormode']));
         if (!Yii::app()->getConfig('demoMode'))
         {
-            setGlobalSetting('defaulttemplate', sanitize_paranoid_string($_POST['defaulttemplate']));
+            $sTemplate=Yii::app()->getRequest()->getPost("defaulttemplate");
+            if(array_key_exists($sTemplate,getTemplateList()))// Filter template name
+            {
+                setGlobalSetting('defaulttemplate', $sTemplate);
+            }
+
         }
         setGlobalSetting('admintheme', sanitize_paranoid_string($_POST['admintheme']));
         setGlobalSetting('adminthemeiconsize', trim(file_get_contents(Yii::app()->getConfig("styledir").DIRECTORY_SEPARATOR.sanitize_paranoid_string($_POST['admintheme']).DIRECTORY_SEPARATOR.'iconsize')));