* Changing checks for [.]./LocalSettings.php and [.]./AdminSettings.php to only

  check for [.]./LocalSettings.php
* Removing function writeAdminSettings (not used at all)

diff --git a/config/index.php b/config/index.php
index 331fdf4..80d429a 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -123,7 +123,7 @@ require_once( "../includes/Namespace.php" );
 
 /* Check for existing configurations and bug out! */
 
-if( file_exists( "../LocalSettings.php" ) || file_exists( "../AdminSettings.php" ) ) {
+if( file_exists( "../LocalSettings.php" ) ) {
        dieout( "<h2>Wiki is configured.</h2>
 
        <p>Already configured... <a href='../index.php'>return to the wiki</a>.</p>
@@ -131,7 +131,7 @@ if( file_exists( "../LocalSettings.php" ) || file_exists( "../AdminSettings.php"
        <p>(You should probably remove this directory for added security.)</p>" );
 }
 
-if( file_exists( "./LocalSettings.php" ) || file_exists( "./AdminSettings.php" ) ) {
+if( file_exists( "./LocalSettings.php" ) ) {
        dieout( "<h2>You're configured!</h2>
 
        <p>Please move <tt>LocalSettings.php</tt> to the parent directory, then
@@ -926,13 +926,6 @@ if( count( $errs ) ) {
 
 /* -------------------------------------------------------------------------------------- */
 
-function writeAdminSettings( $conf ) {
-       return "
-\$wgDBadminuser      = \"{$conf->DBadminuser}\";
-\$wgDBadminpassword  = \"{$conf->DBadminpassword}\";
-";
-}
-
 function escapePhpString( $string ) {
        return strtr( $string,
                array(

diff --git a/config/installer.php b/config/installer.php
index 237c7a3..cb0c39f 100644 (file)
--- a/config/installer.php
+++ b/config/installer.php
@@ -106,7 +106,7 @@ class Installer {
        }
        
        function checkConfigured() {
-               if( file_exists( "../LocalSettings.php" ) || file_exists( "../AdminSettings.php" ) ) {
+               if( file_exists( "../LocalSettings.php" ) ) {
                        $this->ui->warning( "Already configured." );
                        return false;
                }
@@ -114,7 +114,7 @@ class Installer {
        }
        
        function checkInstalled() {
-               if( file_exists( "./LocalSettings.php" ) || file_exists( "./AdminSettings.php" ) ) {
+               if( file_exists( "./LocalSettings.php" ) ) {
                        $this->ui->warning( "Already configured; move LocalSettings.php from this directory to the parent dir and take the wiki for a spin." );
                        return false;
                }
@@ -273,4 +273,4 @@ $ui =& new InstallInterface();
 $i =& new Installer( $ui );
 $i->runInstall();
 
-?>
\ No newline at end of file
+?>