Merge "Special:Newpages feed now shows first revision instead of latest revision"

[lhc/web/wiklou.git] / includes / specials / SpecialCreateAccount.php

diff --git a/includes/specials/SpecialCreateAccount.php b/includes/specials/SpecialCreateAccount.php
index f06a192..73beafc 100644 (file)
--- a/includes/specials/SpecialCreateAccount.php
+++ b/includes/specials/SpecialCreateAccount.php
@@ -119,7 +119,12 @@ class SpecialCreateAccount extends LoginSignupSpecialPage {
                                } else {
                                        $out->addWikiMsg( 'accountcreatedtext', $user->getName() );
                                }
-                               $out->addReturnTo( $this->getPageTitle() );
+
+                               $rt = Title::newFromText( $this->mReturnTo );
+                               $out->addReturnTo(
+                                       ( $rt && !$rt->isExternal() ) ? $rt : $this->getPageTitle(),
+                                       wfCgiToArray( $this->mReturnToQuery )
+                               );
                                return;
                        }
                }
@@ -159,7 +164,7 @@ class SpecialCreateAccount extends LoginSignupSpecialPage {
        }
 
        protected function logAuthResult( $success, $status = null ) {
-               LoggerFactory::getInstance( 'authmanager' )->info( 'Account creation attempt', [
+               LoggerFactory::getInstance( 'authevents' )->info( 'Account creation attempt', [
                        'event' => 'accountcreation',
                        'successful' => $success,
                        'status' => $status,