Do not trigger the "setNewPassword" hook twice (see #5247)

contao · Apr 17, 2013 · 56c5c5a · 56c5c5a
1 parent 5c25875
commit 56c5c5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/contao/modules/ModulePersonalData.php b/contao/modules/ModulePersonalData.php
@@ -209,7 +209,7 @@ protected function compile()
 				}
 
 				// Trigger the save_callback (see #5247)
-				if (!$objWidget->hasErrors() && is_array($arrData['save_callback']))
+				if ($objWidget->submitInput() && !$objWidget->hasErrors() && is_array($arrData['save_callback']))
 				{
 					foreach ($arrData['save_callback'] as $callback)
 					{
@@ -241,16 +241,6 @@ protected function compile()
 					// Set the new field in the member model
 					$blnModified = true;
 					$objMember->$field = $varValue;
-
-					// HOOK: set new password callback
-					if ($objWidget instanceof \FormPassword && isset($GLOBALS['TL_HOOKS']['setNewPassword']) && is_array($GLOBALS['TL_HOOKS']['setNewPassword']))
-					{
-						foreach ($GLOBALS['TL_HOOKS']['setNewPassword'] as $callback)
-						{
-							$this->import($callback[0]);
-							$this->$callback[0]->$callback[1]($this->User, $varValue, $this);
-						}
-					}
 				}
 			}
 

diff --git a/contao/modules/ModuleRegistration.php b/contao/modules/ModuleRegistration.php
@@ -216,15 +216,15 @@ protected function compile()
 				}
 
 				// Save callback
-				if (is_array($arrData['save_callback']))
+				if ($objWidget->submitInput() && !$objWidget->hasErrors() && is_array($arrData['save_callback']))
 				{
 					foreach ($arrData['save_callback'] as $callback)
 					{
 						$this->import($callback[0]);
 
 						try
 						{
-							$varValue = $this->$callback[0]->$callback[1]($varValue, $this->User);
+							$varValue = $this->$callback[0]->$callback[1]($varValue, null);
 						}
 						catch (\Exception $e)
 						{