Revert "Merge pull request #16252 from craftcms/bugfix/16243-show-val…

…idation-error-when-uri-not-unique"

This reverts commit 7debe97, reversing
changes made to f5ff672.

CHANGELOG-WIP.md

@@ -2,7 +2,6 @@
 
 ## Content Management
 - The global sidebar no longer shows “Failed” for queue jobs, for users that don’t have access to the Queue Manager. ([#16184](https://github.com/craftcms/cms/issues/16184))
-- Elements with non-unique URIs now show a validation error rather than become disabled. ([#16243](https://github.com/craftcms/cms/issues/16243), [#16252](https://github.com/craftcms/cms/pull/16252))
 
 ## Administration
 - The Queue Manager utility now shows jobs’ class names. ([#16228](https://github.com/craftcms/cms/pull/16228)) 

src/controllers/ElementsController.php

@@ -1220,7 +1220,7 @@ public function actionDuplicate(): ?Response
                 'isProvisionalDraft' => false,
             ]);
         } catch (InvalidElementException $e) {
-            return $this->_asFailure($element, Craft::t('app', 'Couldn’t duplicate {type}.', [
+            return $this->_asFailure($e->element, Craft::t('app', 'Couldn’t duplicate {type}.', [
                 'type' => $element::lowerDisplayName(),
             ]));
         } catch (Throwable $e) {

src/services/Drafts.php

@@ -372,6 +372,12 @@ public function removeDraftData(ElementInterface $draft): void
         $draft->setScenario(Element::SCENARIO_ESSENTIALS);
         $draft->validate();
 
+        // If there are any errors on the URI, re-validate as disabled
+        if ($draft->hasErrors('uri') && $draft->enabled) {
+            $draft->enabled = false;
+            $draft->validate();
+        }
+
         try {
             if ($draft->hasErrors() || !Craft::$app->getElements()->saveElement($draft, false)) {
                 throw new InvalidElementException($draft, "Draft $draft->id could not be applied because it doesn't validate.");

src/services/Elements.php

@@ -1636,6 +1636,12 @@ public function duplicateElement(
         $mainClone->setScenario(Element::SCENARIO_ESSENTIALS);
         $mainClone->validate();
 
+        // If there are any errors on the URI, re-validate as disabled
+        if ($mainClone->hasErrors('uri') && $mainClone->enabled) {
+            $mainClone->enabled = false;
+            $mainClone->validate();
+        }
+
         if ($mainClone->hasErrors()) {
             throw new InvalidElementException($mainClone, 'Element ' . $element->id . ' could not be duplicated because it doesn\'t validate.');
         }