Merge "Remove LoadBalancer::closeConnecton (deprecated since 1.18)"

diff --combined RELEASE-NOTES-1.24
index 7360e23,44c0250..f510d90
--- 1/RELEASE-NOTES-1.24
--- 2/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@@ -25,7 -25,6 +25,7 @@@ production
    contains an array of interwiki prefixes that should be treated as language
    prefixes (i.e. turned into interlanguage links when $wgInterwikiMagic is set
    to true).
 +* $wgParserTestRemote has been removed.
  
  === New features in 1.24 ===
  * Added a new hook, "WhatLinksHereProps", to allow extensions to annotate
@@@ -83,8 -82,6 +83,8 @@@
  * Skins can now use 'remoteSkinPath' when defining ResourceLoader modules.
    This works the same as 'remoteExtPath' but is relative to the skins/ folder
    instead of the extensions/ folder.
 +* Added the json2.js polyfill for the ES5 JSON.stringify and JSON.parse methods.
 +  Exposed as module "json" with a skip function to optimise loading.
  * Extensions and skins may now use 'namemsg' in $wgExtensionCredits in addition
    to 'name', to allow for the name to be localizable. 'name' should still be
    specified for backwards-compatibility and to define the path Special:Version
@@@ -180,11 -177,11 +180,12 @@@ changes to languages because of Bugzill
  * Removed info(), purge(), revert() and rollback() from the Article class; they
    have since become subclasses of the Action class. (deprecated since 1.19)
  * SearchEngineReplacePrefixesComplete hook was removed.
 +* The "jquery.json" module has been deprecated. Use the "json" module instead.
  * Removed HTMLForm::addJS(). (deprecated since 1.18)
  * Removed LogEventsList::showHeader(). (deprecated since 1.19)
  * Removed ImageGalleryBase::useSkin(). (deprecated since 1.18)
  * Removed DatabaseMysqlBase::getLagFromProcesslist(). (deprecated since 1.19)
+ * Removed LoadBalancer::closeConnecton(). (deprecated since 1.18)
  
  ==== Renamed classes ====
  * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression

diff --combined includes/db/LoadBalancer.php
index 306c2d3,85da865..b3f9210
--- 1/includes/db/LoadBalancer.php
--- 2/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@@ -414,7 -414,11 +414,7 @@@ class LoadBalancer 
        public function &getConnection( $i, $groups = array(), $wiki = false ) {
                wfProfileIn( __METHOD__ );
  
 -              if ( $i == DB_LAST ) {
 -                      wfProfileOut( __METHOD__ );
 -                      throw new MWException( 'Attempt to call ' . __METHOD__ .
 -                              ' with deprecated server index DB_LAST' );
 -              } elseif ( $i === null || $i === false ) {
 +              if ( $i === null || $i === false ) {
                        wfProfileOut( __METHOD__ );
                        throw new MWException( 'Attempt to call ' . __METHOD__ .
                                ' with invalid server index' );
@@@ -868,17 -872,6 +868,6 @@@
                );
        }
  
-       /**
-        * Deprecated function, typo in function name
-        *
-        * @deprecated since 1.18
-        * @param DatabaseBase $conn
-        */
-       function closeConnecton( $conn ) {
-               wfDeprecated( __METHOD__, '1.18' );
-               $this->closeConnection( $conn );
-       }
- 
        /**
         * Close a connection
         * Using this function makes sure the LoadBalancer knows the connection is closed.