| Index: trunk/extensions/CentralAuth/specials/SpecialMergeAccount.php |
| — | — | @@ -1,6 +1,8 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | class SpecialMergeAccount extends SpecialPage { |
| | 5 | + |
| | 6 | + protected $mUserName, $mAttemptMerge, $mMergeAction, $mPassword, $mWikiIDs, $mSessionToken, $mSessionKey; |
| 5 | 7 | function __construct() { |
| 6 | 8 | parent::__construct( 'MergeAccount', 'centralauth-merge' ); |
| 7 | 9 | } |
| — | — | @@ -17,7 +19,7 @@ |
| 18 | 20 | |
| 19 | 21 | if ( !$wgUser->isLoggedIn() ) { |
| 20 | 22 | $loginpage = SpecialPage::getTitleFor( 'Userlogin' ); |
| 21 | | - $loginurl = $loginpage->getFullUrl( array( 'returnto' => $this->getTitle->getPrefixedText() ) ); |
| | 23 | + $loginurl = $loginpage->getFullUrl( array( 'returnto' => $this->getTitle()->getPrefixedText() ) ); |
| 22 | 24 | $wgOut->addWikiMsg( 'centralauth-merge-notlogged', $loginurl ); |
| 23 | 25 | $wgOut->addWikiMsg( 'centralauth-readmore-text' ); |
| 24 | 26 | |