From 0448eed73e63636c2d783ca2507f25a7e76194dc Mon Sep 17 00:00:00 2001 From: Peter Gehres Date: Thu, 16 May 2013 15:18:57 -0700 Subject: [PATCH] Changing "private" to "protected" on a few functions in User.php This is required for auth plugins to be able to send customized email confirmation and migration emails. For example, we need to send emails from CentralAuth that will both confirm the email address and then run through Special:MergeAccount attempting to attach as many local accounts as possible. Change-Id: If281aa6219e5a0b80252b0deac7ee0c4f74c3d58 --- includes/User.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/User.php b/includes/User.php index 1d87d40c01..e2cbb816f5 100644 --- a/includes/User.php +++ b/includes/User.php @@ -912,7 +912,7 @@ class User { * * @param $item String */ - private function setItemLoaded( $item ) { + protected function setItemLoaded( $item ) { if ( is_array( $this->mLoadedItems ) ) { $this->mLoadedItems[$item] = true; } @@ -3668,7 +3668,7 @@ class User { * @param &$expiration \mixed Accepts the expiration time * @return String New token */ - private function confirmationToken( &$expiration ) { + protected function confirmationToken( &$expiration ) { global $wgUserEmailConfirmationTokenExpiry; $now = time(); $expires = $now + $wgUserEmailConfirmationTokenExpiry; @@ -3686,7 +3686,7 @@ class User { * @param string $token Accepts the email confirmation token * @return String New token URL */ - private function confirmationTokenUrl( $token ) { + protected function confirmationTokenUrl( $token ) { return $this->getTokenUrl( 'ConfirmEmail', $token ); } @@ -3695,7 +3695,7 @@ class User { * @param string $token Accepts the email confirmation token * @return String New token URL */ - private function invalidationTokenUrl( $token ) { + protected function invalidationTokenUrl( $token ) { return $this->getTokenUrl( 'InvalidateEmail', $token ); } -- 2.20.1