[5.3] Upmerge 2025-04-03

bembelimen · web-flow · commit 66cbc51da118 · 2025-04-03T17:07:32.000+02:00
diff --git a/composer.json b/composer.json
@@ -58,7 +58,7 @@
     "joomla/console": "^3.0.1",
     "joomla/crypt": "^3.0.1",
     "joomla/data": "^3.0.1",
-    "joomla/database": "^3.3.1",
+    "joomla/database": "^3.4",
     "joomla/di": "^3.0.1",
     "joomla/event": "^3.0.1",
     "joomla/filter": "^3.0.2",
diff --git a/composer.lock b/composer.lock
diff --git a/libraries/src/User/User.php b/libraries/src/User/User.php
@@ -771,6 +771,11 @@ public function save($updateOnly = false)
                 }
             }
 
+            // Unset the activation token, if the mail address changes - that affects both, activation and PW resets
+            if ($this->email !== $oldUser->email && $this->id !== 0 && !empty($this->activation) && !$this->block) {
+                $table->activation = '';
+            }
+
             // Fire the onUserBeforeSave event.
             $dispatcher = Factory::getApplication()->getDispatcher();
             PluginHelper::importPlugin('user', null, true, $dispatcher);

Original file line number	Diff line number	Diff line change
`@@ -771,6 +771,11 @@ public function save($updateOnly = false)`
`771`	`771`	`}`
`772`	`772`	`}`
`773`	`773`
	`774`	`+ // Unset the activation token, if the mail address changes - that affects both, activation and PW resets`
	`775`	`+ if ($this->email !== $oldUser->email && $this->id !== 0 && !empty($this->activation) && !$this->block) {`
	`776`	`+ $table->activation = '';`
	`777`	`+ }`
	`778`	`+`
`774`	`779`	`// Fire the onUserBeforeSave event.`
`775`	`780`	`$dispatcher = Factory::getApplication()->getDispatcher();`
`776`	`781`	`PluginHelper::importPlugin('user', null, true, $dispatcher);`