installer: Remove obsolete config-no-cache message

Follows-up 02c3f68048.

The older message is obsolete now that we require PHP 5.5.9+.

Change-Id: I68199c2ec91c8447fe7e556a6c77f1da39eb5163

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 70fa857..c076cba 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -843,12 +843,7 @@ abstract class Installer {
                }
 
                if ( !$caches ) {
-                       $key = 'config-no-cache';
-                       // PHP >=5.5 is called APCu, earlier versions use APC (T61998).
-                       if ( !wfIsHHVM() && version_compare( PHP_VERSION, '5.5', '>=' ) ) {
-                               // config-no-cache-apcu
-                               $key .= '-apcu';
-                       }
+                       $key = 'config-no-cache-apcu';
                        $this->showMessage( $key );
                }
 

diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index ea03831..6adc299 100644 (file)
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -63,7 +63,6 @@
        "config-xcache": "[http://xcache.lighttpd.net/ XCache] is installed",
        "config-apc": "[http://www.php.net/apc APC] is installed",
        "config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] is installed",
-       "config-no-cache": "<strong>Warning:</strong> Could not find [http://www.php.net/apc APC], [http://xcache.lighttpd.net/ XCache] or [http://www.iis.net/download/WinCacheForPhp WinCache].\nObject caching is not enabled.",
        "config-no-cache-apcu": "<strong>Warning:</strong> Could not find [http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] or [http://www.iis.net/download/WinCacheForPhp WinCache].\nObject caching is not enabled.",
        "config-mod-security": "<strong>Warning:</strong> Your web server has [http://modsecurity.org/ mod_security]/mod_security2 enabled. Many common configurations of this will cause problems for MediaWiki and other software that allows users to post arbitrary content.\nIf possible, this should be disabled. Otherwise, refer to [http://modsecurity.org/documentation/ mod_security documentation] or contact your host's support if you encounter random errors.",
        "config-diff3-bad": "GNU diff3 not found.",

diff --git a/includes/installer/i18n/qqq.json b/includes/installer/i18n/qqq.json
index e20f230..e734801 100644 (file)
--- a/includes/installer/i18n/qqq.json
+++ b/includes/installer/i18n/qqq.json
@@ -81,7 +81,6 @@
        "config-xcache": "Message indicates if this program is available",
        "config-apc": "Message indicates if this program is available",
        "config-wincache": "Message indicates if this program is available",
-       "config-no-cache": "Status message in the MediaWiki installer environment checks.",
        "config-no-cache-apcu": "Status message in the MediaWiki installer environment checks.",
        "config-mod-security": "Status message in the MediaWiki installer environment checks.",
        "config-diff3-bad": "Status message in the MediaWiki installer environment checks.",