Merge "Deprecate SpecialPage::getTitle"

diff --combined RELEASE-NOTES-1.23
index d9fbcba,a54e57e..6078234
--- 1/RELEASE-NOTES-1.23
--- 2/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@@ -24,8 -24,6 +24,8 @@@ production
  * Preferences 'watchcreations' and 'watchdefault' ("Add pages I create and files
    I upload to my watchlist", "Add pages and files I edit to my watchlist") are
    now enabled by default.
 +* $wgLBFactoryConf: Class names have had underscores removed. The configuration
 +  should be updated if LBFactory_Simple or LBFactory_Multi is configured.
  
  === New features in 1.23 ===
  * ResourceLoader can utilize the Web Storage API to cache modules client-side.
@@@ -92,14 -90,6 +92,14 @@@
    properly for all parameters.
  * ApiQueryBase::titlePartToKey allows an extra parameter that indicates the
    namespace in order to properly capitalize the title part.
 +* Renamed classes:
 +  - LBFactory_Fake to LBFactoryFake
 +  - LBFactory_Multi to LBFactoryMulti
 +  - LBFactory_Simple to LBFactorySimple
 +  - LBFactory_Single to LBFactorySingle
 +  - LoadBalancer_Single to LoadBalancerSingle
 +  - LoadMonitor_MySQL to LoadMonitorMySQL
 +  - LoadMonitor_Null to LoadMonitorNull
  
  === Languages updated in 1.23 ===
  
@@@ -136,6 -126,8 +136,8 @@@ changes to languages because of Bugzill
    and their definition was changed not to include the common*.css files;
    the two skins now load the 'skins.common.interface' module instead.
  * A page_links_updated field has been added to the page table.
+ * SpecialPage::getTitle has been deprecated in favor of
+   SpecialPage::getPageTitle.
  
  == Compatibility ==
  

diff --combined includes/specials/SpecialContributions.php
index 3af86f0,262e238..6b56c2f
--- 1/includes/specials/SpecialContributions.php
--- 2/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@@ -98,10 -98,10 +98,10 @@@ class SpecialContributions extends Spec
                        $this->getSkin()->setRelevantUser( $userObj );
                } else {
                        $out->addSubtitle( $this->msg( 'sp-contributions-newbies-sub' ) );
 -                      $out->setHTMLTitle(
 -                              $this->msg( 'pagetitle', $this->msg( 'sp-contributions-newbies-title' ) )
 -                                      ->inContentLanguage()->plain()
 -                      );
 +                      $out->setHTMLTitle( $this->msg(
 +                              'pagetitle',
 +                              $this->msg( 'sp-contributions-newbies-title' )->plain()
 +                      )->inContentLanguage() );
                }
  
                if ( ( $ns = $request->getVal( 'namespace', null ) ) !== null && $ns !== '' ) {
@@@ -354,7 -354,7 +354,7 @@@
        protected function getForm() {
                global $wgScript;
  
-               $this->opts['title'] = $this->getTitle()->getPrefixedText();
+               $this->opts['title'] = $this->getPageTitle()->getPrefixedText();
                if ( !isset( $this->opts['target'] ) ) {
                        $this->opts['target'] = '';
                } else {

diff --combined includes/specials/SpecialMovepage.php
index 9193b5d,e56723c..b29b3f9
--- 1/includes/specials/SpecialMovepage.php
--- 2/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@@ -281,7 -281,7 +281,7 @@@ class MovePageForm extends UnlistedSpec
                                'form',
                                array(
                                        'method' => 'post',
-                                       'action' => $this->getTitle()->getLocalURL( 'action=submit' ),
+                                       'action' => $this->getPageTitle()->getLocalURL( 'action=submit' ),
                                        'id' => 'movepage'
                                )
                        ) .
@@@ -351,16 -351,7 +351,16 @@@
                        );
                }
  
 -              if ( $user->isAllowed( 'suppressredirect' ) && $handler->supportsRedirects() ) {
 +              if ( $user->isAllowed( 'suppressredirect' ) ) {
 +                      if ( $handler->supportsRedirects() ) {
 +                              $isChecked = $this->leaveRedirect;
 +                              $options = array();
 +                      } else {
 +                              $isChecked = false;
 +                              $options = array(
 +                                      'disabled' => 'disabled'
 +                              );
 +                      }
                        $out->addHTML( "
                                <tr>
                                        <td></td>
@@@ -369,8 -360,7 +369,8 @@@
                                                $this->msg( 'move-leave-redirect' )->text(),
                                                'wpLeaveRedirect',
                                                'wpLeaveRedirect',
 -                                              $this->leaveRedirect
 +                                              $isChecked,
 +                                              $options
                                        ) .
                                        "</td>
                                </tr>"