Clean tabs/spaces for r73853

[lhc/web/wiklou.git] / maintenance / install-utils.inc

diff --git a/maintenance/install-utils.inc b/maintenance/install-utils.inc
index 76cec61..e37aeb9 100644 (file)
--- a/maintenance/install-utils.inc
+++ b/maintenance/install-utils.inc
@@ -180,14 +180,7 @@ function readlineEmulation( $prompt ) {
 function dbsource( $fname, $db = false ) {
        wfDeprecated( __METHOD__ );
        if ( !$db ) {
-               // Try $wgDatabase, which is used in the install and update scripts
-               global $wgDatabase;
-               if ( isset( $wgDatabase ) ) {
-                       $db = $wgDatabase;
-               } else {
-                       // No? Well, we must be outside of those scripts, so use the standard method
-                       $db = wfGetDB( DB_MASTER );
-               }
+               $db = wfGetDB( DB_MASTER );
        }
        $error = $db->sourceFile( $fname );
        if ( $error !== true ) {
@@ -196,6 +189,11 @@ function dbsource( $fname, $db = false ) {
        }
 }
 
+function archive( $name ) {
+       wfDeprecated( __METHOD__ );
+       return DatabaseBase::patchPath( $name );
+}
+
 /**
  * Get the value of session.save_path
  *