Dev: Switch survey to default template if no configuration found.

LimeSurvey · Nov 23, 2017 · 9f93b5d · 9f93b5d
1 parent a3e0300
commit 9f93b5d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -150,10 +150,17 @@ public static function getInstanceFromConfigurationId($iTemplateConfigId) {
      * @return TemplateConfiguration
      */
     public static function getInstanceFromTemplateName($sTemplateName) {
-        return  self::model()->find(
+        $oInstance = self::model()->find(
             'template_name=:template_name AND sid IS NULL AND gsid IS NULL',
             array(':template_name'=>$sTemplateName)
         );
+
+        // If the survey configuration table of the wanted template doesn't exist (eg: manually deleted), then we provide the default one. 
+        if (! is_a($oInstance, 'TemplateConfiguration')  ){
+            $oInstance = self::getInstanceFromTemplateName('default');
+        }
+
+        return $oInstance;
     }
 
     /**
@@ -215,6 +222,7 @@ public static function getInstanceFromSurveyId($iSurveyId, $sTemplateName = null
         // TODO: Move to SurveyGroup creation, right now the 'lazy loading' approach is ok.
         if (!is_a($oTemplateConfigurationModel, 'TemplateConfiguration') && $sTemplateName != null) {
             $oTemplateConfigurationModel = TemplateConfiguration::getInstanceFromTemplateName($sTemplateName);
+
             $oTemplateConfigurationModel->id = null;
             $oTemplateConfigurationModel->isNewRecord = true;
             $oTemplateConfigurationModel->sid = $iSurveyId;