Partial revert of r53664 (bug 14201 Set $wgDBadminuser/$wgDBadminpassword during...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2a9249b..1648f64 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -151,7 +151,6 @@ this. Was used when mwEmbed was going to be an extension.
 * If config/ directory is not executable, the command to make it executable 
   now asks the user to cd to the correct directory
 * Add experimental new external authentication framework, ExternalAuth
-* (bug 14201) Set $wgDBadminuser/$wgDBadminpassword during setup
 * (bug 18768) Remove AdminSettings requirements. Maintenance environment
   will still load it if it exists, but it's not required for anything
 * (bug 19900) The "listgrouprights-key" message is now wrapped in a div with

diff --git a/config/Installer.php b/config/Installer.php
index 4967790..6d54d86 100644 (file)
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -621,7 +621,6 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
        $conf->RootUser = importPost( "RootUser", "root" );
        $conf->RootPW = importPost( "RootPW", "" );
        $useRoot = importCheck( 'useroot', false );
-       $conf->populateadmin = importCheck( 'populateadmin', false );
        $conf->LanguageCode = importPost( "LanguageCode", "en" );
        ## MySQL specific:
        $conf->DBprefix     = importPost( "DBprefix" );
@@ -1557,8 +1556,6 @@ if( count( $errs ) ) {
                <label class="column">Superuser account:</label>
                <input type="checkbox" name="useroot" id="useroot" <?php if( $useRoot ) { ?>checked="checked" <?php } ?> />
                &nbsp;<label for="useroot">Use superuser account</label>
-               <input type="checkbox" name="populateadmin" id="populateadmin" <?php if( $conf->populateadmin ) { ?>checked="checked" <?php } ?> />
-               &nbsp;<label for="populateadmin">Set as admin user for maintenance</label>
        </div>
        <div class="config-input"><?php aField( $conf, "RootUser", "Superuser name:", "text" ); ?></div>
        <div class="config-input"><?php aField( $conf, "RootPW", "Superuser password:", "password" ); ?></div>
@@ -1824,11 +1821,6 @@ function writeLocalSettings( $conf ) {
                # Needs literal string interpolation for the current style path
                $slconf['RightsIcon'] = $conf->RightsIcon;
        }
-       
-       if( $conf->populateadmin ) {
-               $slconf['DBadminuser'] = $conf->RootUser;
-               $slconf['DBadminpassword'] = $conf->RootPW;
-       }
 
        if( $conf->DBtype == 'mysql' ) {
                $dbsettings =
@@ -1933,10 +1925,6 @@ if ( \$wgCommandLineMode ) {
 
 {$dbsettings}
 
-## Database admin settings, used for maintenance scripts
-\$wgDBadminuser     = \"". ($conf->populateadmin ? $slconf['DBadminuser'] : '' )."\";
-\$wgDBadminpassword     = \"". ($conf->populateadmin ? $slconf['DBadminpassword'] : '' )."\";
-
 ## Shared memory settings
 \$wgMainCacheType = $cacheType;
 \$wgMemCachedServers = $mcservers;