Fixed issue #19527: Theme listing broke with invalid template (LimeSu…

…rvey#3858)
SondagesPro · Jun 4, 2024 · 4f9c2f6 · 4f9c2f6
1 parent 741019a
commit 4f9c2f6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -453,10 +453,10 @@ public function search()
         $criteria->join = 'INNER JOIN {{templates}} AS template ON ' .
             App()->db->quoteColumnName("t.template_name") .
             ' = template.name';
-        //Don't show surveyspecifi settings on the overview
+        //Don't show surveyspecific settings on the overview
         $criteria->addCondition('t.sid IS NULL');
         $criteria->addCondition('t.gsid IS NULL');
-        $criteria->addCondition('template.name IS NOT NULL');
+        $criteria->addInCondition('template.name', array_keys(Template::getTemplateList()));
 
         $criteria->compare('id', $this->id);
         $criteria->compare('template_name', $this->template_name, true);
@@ -494,7 +494,7 @@ public function searchGrid(?int $gsid = null)
         $criteria->together = true;
         //Don't show surveyspecifi settings on the overview
         $criteria->addCondition('t.sid IS NULL');
-        $criteria->addCondition('template.name IS NOT NULL');
+        $criteria->addInCondition('template.name', array_keys(Template::getTemplateList()));
 
         if ($gsid !== null) {
             /* Group configuration */