If isConfirmedEmail (already confirmed), skip dbtouch/hook call

Bug: 46655
Change-Id: I5ea64611f68e01b1e82cd9dbe564123e81b17ed9

diff --git a/includes/User.php b/includes/User.php
index cc97774..2b7c787 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -3674,8 +3674,12 @@ class User {
         * @return bool
         */
        public function confirmEmail() {
-               $this->setEmailAuthenticationTimestamp( wfTimestampNow() );
-               wfRunHooks( 'ConfirmEmailComplete', array( $this ) );
+               // Check if it's already confirmed, so we don't touch the database
+               // and fire the ConfirmEmailComplete hook on redundant confirmations.
+               if ( !$this->isEmailConfirmed() ) {
+                       $this->setEmailAuthenticationTimestamp( wfTimestampNow() );
+                       wfRunHooks( 'ConfirmEmailComplete', array( $this ) );
+               }
                return true;
        }