Remove install-utils.inc marked for 1.19 removal

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 0818158..a82f6de 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -106,7 +106,6 @@ if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
 $maintenance->finalSetup();
 // Some last includes
 require_once( MWInit::compiledPath( 'includes/Setup.php' ) );
-require_once( MWInit::compiledPath( 'maintenance/install-utils.inc' ) );
 
 // Much much faster startup than creating a title object
 $wgTitle = null;

diff --git a/maintenance/install-utils.inc b/maintenance/install-utils.inc
deleted file mode 100644 (file)
index 7013033..0000000
--- a/maintenance/install-utils.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * This file contains ancient db-related functions that have been deprecated. Do
- * not use them. Please find the appropriate replacements.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- */
-
-/**
- * @deprecated Use DatabaseBase::sourceFile(). Will probably be removed in 1.19
- */
-function dbsource( $fname, $db = false ) {
-       wfDeprecated( __METHOD__ );
-       if ( !$db ) {
-               $db = wfGetDB( DB_MASTER );
-       }
-       $error = $db->sourceFile( $fname );
-       if ( $error !== true ) {
-               print $error;
-               exit( 1 );
-       }
-}