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

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 7360e23..f510d90 100644 (file)
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -185,6 +185,7 @@ changes to languages because of Bugzilla reports.
 * 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 --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 306c2d3..b3f9210 100644 (file)
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -868,17 +868,6 @@ class LoadBalancer {
                );
        }
 
-       /**
-        * 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.