Make returnto parameter work as well with cookieRedirect

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 2ec5942..06e481a 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -926,7 +926,9 @@ class LoginForm {
                global $wgOut;
 
                $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
-               $check = $titleObj->getFullURL( 'wpCookieCheck='.$type );
+               $query = array( 'wpCookieCheck' => $type );
+               if ( $this->mReturnTo ) $query['returnto'] = $this->mReturnTo;
+               $check = $titleObj->getFullURL( $query );
 
                return $wgOut->redirect( $check );
        }