Remove that ugly unset( $vars['_lsExists'] );

Shouldn't the second file_exists() also need a wfSuppressWarnings?
Follow up to r78118.

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 766b4f4..1338d0a 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -225,18 +225,17 @@ abstract class Installer {
                $_lsExists = file_exists( "$IP/LocalSettings.php" );
                wfRestoreWarnings();
 
-               if( $_lsExists ) {
-                       require( "$IP/includes/DefaultSettings.php" );
-                       require( "$IP/LocalSettings.php" );
-                       if ( file_exists( "$IP/AdminSettings.php" ) ) {
-                               require( "$IP/AdminSettings.php" );
-                       }
-                       $vars = get_defined_vars();
-                       unset( $vars['_lsExists'] );
-                       return $vars;
-               } else {
+               if( !$_lsExists ) {
                        return false;
                }
+               unset($_lsExists);
+
+               require( "$IP/includes/DefaultSettings.php" );
+               require( "$IP/LocalSettings.php" );
+               if ( file_exists( "$IP/AdminSettings.php" ) ) {
+                       require( "$IP/AdminSettings.php" );
+               }
+               return get_defined_vars();
        }
 
        /**