Template speichern korrigiert/optimiert (#5495)

redaxo · Jan 8, 2023 · 084b79c · 084b79c
1 parent dd76f50
commit 084b79c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/.tools/psalm/baseline.xml b/.tools/psalm/baseline.xml
@@ -3146,8 +3146,7 @@
     </PossiblyNullReference>
   </file>
   <file src="redaxo/src/addons/structure/plugins/content/pages/templates.php">
-    <ArgumentTypeCoercion occurrences="2">
-      <code>$templatename</code>
+    <ArgumentTypeCoercion occurrences="1">
       <code>$templatename</code>
     </ArgumentTypeCoercion>
     <MixedArgument occurrences="1">
@@ -3174,8 +3173,7 @@
       <code>rex_escape($templatekey)</code>
       <code>rex_escape($templatename)</code>
     </NullOperand>
-    <PossiblyNullArgument occurrences="2">
-      <code>$templatename</code>
+    <PossiblyNullArgument occurrences="1">
       <code>$templatename</code>
     </PossiblyNullArgument>
   </file>

diff --git a/redaxo/src/addons/structure/plugins/content/pages/templates.php b/redaxo/src/addons/structure/plugins/content/pages/templates.php
@@ -72,6 +72,7 @@
     }
 
     if ('ja' == $save) {
+        $previousActive = $active;
         $active = rex_post('active', 'int');
         $templatename = rex_post('templatename', 'string');
         $template = rex_post('content', 'string');
@@ -147,16 +148,15 @@
                 }
             }
         } else {
-            $templateIsInUseError = rex_template::templateIsInUse($templateId, 'cant_inactivate_template_because_its_in_use');
-            if (false !== $templateIsInUseError) {
-                $error .= $templateIsInUseError;
-            }
-            if (rex_template::getDefaultId() == $templateId) {
-                $query = rex_sql::factory();
-                $query->setQuery('SELECT name FROM '.rex::getTable('template').' WHERE id = '.$templateId);
-                $templatename = $query->getValue('name');
+            if ($previousActive && !$active) {
+                if (rex_template::getDefaultId() == $templateId) {
+                    $error .= rex_i18n::msg('cant_inactivate_template_because_its_default_template', $templatename);
+                }
 
-                $error .= rex_i18n::msg('cant_inactivate_template_because_its_default_template', $templatename);
+                $templateIsInUseError = rex_template::templateIsInUse($templateId, 'cant_inactivate_template_because_its_in_use');
+                if (false !== $templateIsInUseError) {
+                    $error .= ($error ? '<br><br>' : '').$templateIsInUseError;
+                }
             }
 
             if ('' == $error) {