Remove various "success" messages from Welcome screen on installer, no need to confus...

[lhc/web/wiklou.git] / includes / installer / Installer.php

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 80e8974..baab522 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -388,16 +388,13 @@ abstract class Installer {
                        return false;
                }
 
-               $this->showMessage( 'config-have-db', $wgLang->listToText( $goodNames ), count( $goodNames ) );
-
                // Check for FTS3 full-text search module
                $sqlite = $this->getDBInstaller( 'sqlite' );
                if ( $sqlite->isCompiled() ) {
                        $db = new DatabaseSqliteStandalone( ':memory:' );
-                       $this->showMessage( $db->getFulltextSearchModule() == 'FTS3'
-                               ? 'config-have-fts3'
-                               : 'config-no-fts3'
-                       );
+                       if( $db->getFulltextSearchModule() == 'FTS3' ) {
+                               $this->showMessage( 'config-no-fts3' );
+                       }
                }
        }
 
@@ -492,7 +489,6 @@ abstract class Installer {
                        $this->showMessage( 'config-xml-bad' );
                        return false;
                }
-               $this->showMessage( 'config-xml-good' );
        }
 
        /**
@@ -519,7 +515,6 @@ abstract class Installer {
                $limit = ini_get( 'memory_limit' );
 
                if ( !$limit || $limit == -1 ) {
-                       $this->showMessage( 'config-memory-none' );
                        return true;
                }
 
@@ -539,7 +534,7 @@ abstract class Installer {
                                $this->setVar( '_RaiseMemory', true );
                        }
                } else {
-                       $this->showMessage( 'config-memory-ok', $limit );
+                       return true;
                }
        }
 
@@ -547,12 +542,10 @@ abstract class Installer {
         * Environment check for compiled object cache types.
         */
        protected function envCheckCache() {
-               $caches = array();
-
+               $caches = false;
                foreach ( $this->objectCaches as $name => $function ) {
                        if ( function_exists( $function ) ) {
                                $caches[$name] = true;
-                               $this->showMessage( 'config-' . $name );
                        }
                }
 
@@ -573,7 +566,6 @@ abstract class Installer {
                $diff3 = $this->locateExecutableInDefaultPaths( $names, $versionInfo );
 
                if ( $diff3 ) {
-                       $this->showMessage( 'config-diff3-good', $diff3 );
                        $this->setVar( 'wgDiff3', $diff3 );
                } else {
                        $this->setVar( 'wgDiff3', false );
@@ -608,7 +600,6 @@ abstract class Installer {
                $IP = dirname( dirname( dirname( __FILE__ ) ) );
 
                $this->setVar( 'IP', $IP );
-               $this->showMessage( 'config-dir', $IP );
 
                // PHP_SELF isn't available sometimes, such as when PHP is CGI but
                // cgi.fix_pathinfo is disabled. In that case, fall back to SCRIPT_NAME
@@ -627,7 +618,6 @@ abstract class Installer {
 
                $uri = preg_replace( '{^(.*)/config.*$}', '$1', $path );
                $this->setVar( 'wgScriptPath', $uri );
-               $this->showMessage( 'config-uri', $uri );
        }
 
        /**
@@ -640,9 +630,7 @@ abstract class Installer {
                } else {
                        $ext = 'php';
                }
-
                $this->setVar( 'wgScriptExtension', ".$ext" );
-               $this->showMessage( 'config-file-extension', $ext );
        }
 
        /**
@@ -686,7 +674,6 @@ abstract class Installer {
                # Try the current value of LANG.
                if ( isset( $candidatesByLocale[ getenv( 'LANG' ) ] ) ) {
                        $this->setVar( 'wgShellLocale', getenv( 'LANG' ) );
-                       $this->showMessage( 'config-shell-locale', getenv( 'LANG' ) );
                        return true;
                }
 
@@ -695,7 +682,6 @@ abstract class Installer {
                foreach ( $commonLocales as $commonLocale ) {
                        if ( isset( $candidatesByLocale[$commonLocale] ) ) {
                                $this->setVar( 'wgShellLocale', $commonLocale );
-                               $this->showMessage( 'config-shell-locale', $commonLocale );
                                return true;
                        }
                }
@@ -706,7 +692,6 @@ abstract class Installer {
                if ( isset( $candidatesByLang[$wikiLang] ) ) {
                        $m = reset( $candidatesByLang[$wikiLang] );
                        $this->setVar( 'wgShellLocale', $m[0] );
-                       $this->showMessage( 'config-shell-locale', $m[0] );
                        return true;
                }
 
@@ -714,7 +699,6 @@ abstract class Installer {
                if ( count( $candidatesByLocale ) ) {
                        $m = reset( $candidatesByLocale );
                        $this->setVar( 'wgShellLocale', $m[0] );
-                       $this->showMessage( 'config-shell-locale', $m[0] );
                        return true;
                }
 
@@ -733,7 +717,7 @@ abstract class Installer {
                $safe = !$this->dirIsExecutable( $dir, $url );
 
                if ( $safe ) {
-                       $this->showMessage( 'config-uploads-safe' );
+                       return true;
                } else {
                        $this->showMessage( 'config-uploads-not-safe', $dir );
                }