From 26f386ae55e500b32138da5c6c5d4fc8cd330b20 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 25 Jun 2014 16:12:36 -0700 Subject: [PATCH] Removed old DB_LAST cruft Change-Id: I5517c43389182e61e4a969ed9ca71dae2388a5d0 --- includes/Defines.php | 1 - includes/db/LoadBalancer.php | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/includes/Defines.php b/includes/Defines.php index ce4ede3aeb..e0579cbf06 100644 --- a/includes/Defines.php +++ b/includes/Defines.php @@ -59,7 +59,6 @@ define( 'DB_MASTER', -2 ); # Write to master (or only server) # Obsolete aliases define( 'DB_READ', -1 ); define( 'DB_WRITE', -2 ); -define( 'DB_LAST', -3 ); # deprecated since 2008, usage throws exception /**@{ * Virtual namespaces; don't appear in the page database diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php index ee35c13ce4..306c2d36b7 100644 --- a/includes/db/LoadBalancer.php +++ b/includes/db/LoadBalancer.php @@ -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' ); -- 2.20.1