X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fexception%2FUserNotLoggedIn.php;h=b7c3489b26828dc034516e16c0c846b248fe43ce;hb=3617c982c9db793;hp=03ba0b2039c0440cf3380045c92426867f6d0788;hpb=a15fe7dd93cfcd9510b54b8481b4c3aa891ac380;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/exception/UserNotLoggedIn.php b/includes/exception/UserNotLoggedIn.php
index 03ba0b2039..b7c3489b26 100644
--- a/includes/exception/UserNotLoggedIn.php
+++ b/includes/exception/UserNotLoggedIn.php
@@ -25,8 +25,9 @@
  * 'exception-nologin' as a title and 'exception-nologin-text' for the message.
  *
  * @note In order for this exception to redirect, the error message passed to the
- * constructor has to be explicitly added to LoginForm::validErrorMessages. Otherwise,
- * the user will just be shown the message rather than redirected.
+ * constructor has to be explicitly added to LoginHelper::validErrorMessages or with
+ * the LoginFormValidErrorMessages hook. Otherwise, the user will just be shown the message
+ * rather than redirected.
  *
  * @par Example:
  * @code
@@ -52,7 +53,8 @@
 class UserNotLoggedIn extends ErrorPageError {
 
 	/**
-	 * @note The value of the $reasonMsg parameter must be put into LoginForm::validErrorMessages
+	 * @note The value of the $reasonMsg parameter must be put into LoginForm::validErrorMessages or
+	 * set with the LoginFormValidErrorMessages Hook.
 	 * if you want the user to be automatically redirected to the login form.
 	 *
 	 * @param string $reasonMsg A message key containing the reason for the error.
@@ -65,7 +67,7 @@ class UserNotLoggedIn extends ErrorPageError {
 	public function __construct(
 		$reasonMsg = 'exception-nologin-text',
 		$titleMsg = 'exception-nologin',
-		$params = array()
+		$params = []
 	) {
 		parent::__construct( $titleMsg, $reasonMsg, $params );
 	}
@@ -77,7 +79,7 @@ class UserNotLoggedIn extends ErrorPageError {
 	public function report() {
 		// If an unsupported message is used, don't try redirecting to Special:Userlogin,
 		// since the message may not be compatible.
-		if ( !in_array( $this->msg, LoginForm::$validErrorMessages ) ) {
+		if ( !in_array( $this->msg, LoginHelper::getValidErrorMessages() ) ) {
 			parent::report();
 		}
 
@@ -90,12 +92,12 @@ class UserNotLoggedIn extends ErrorPageError {
 		// Title will be overridden by returnto
 		unset( $query['title'] );
 		// Redirect to Special:Userlogin
-		$output->redirect( SpecialPage::getTitleFor( 'Userlogin' )->getFullURL( array(
+		$output->redirect( SpecialPage::getTitleFor( 'Userlogin' )->getFullURL( [
 			// Return to this page when the user logs in
 			'returnto' => $context->getTitle()->getFullText(),
 			'returntoquery' => wfArrayToCgi( $query ),
 			'warning' => $this->msg,
-		) ) );
+		] ) );
 
 		$output->output();
 	}