X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=de841993b5916893578dfb1dec57a7231e4abb04;hb=3b26b9aca28bb379ee1c47946819f219514ff6d9;hp=ba0e38ffbc2c5ac741220d2d49a220e264e11290;hpb=36e17cb9023fec198ea1b46504ca5ff99ef3a0af;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index ba0e38ffbc..de841993b5 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -169,6 +169,7 @@ abstract class Installer {
 		'wgEnotifUserTalk',
 		'wgEnotifWatchlist',
 		'wgEmailAuthentication',
+		'wgDBname',
 		'wgDBtype',
 		'wgDiff3',
 		'wgImageMagickConvertCommand',
@@ -281,15 +282,15 @@ abstract class Installer {
 	 */
 	public $licenses = array(
 		'cc-by' => array(
-			'url' => 'https://creativecommons.org/licenses/by/3.0/',
+			'url' => 'https://creativecommons.org/licenses/by/4.0/',
 			'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by.png',
 		),
 		'cc-by-sa' => array(
-			'url' => 'https://creativecommons.org/licenses/by-sa/3.0/',
+			'url' => 'https://creativecommons.org/licenses/by-sa/4.0/',
 			'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by-sa.png',
 		),
 		'cc-by-nc-sa' => array(
-			'url' => 'https://creativecommons.org/licenses/by-nc-sa/3.0/',
+			'url' => 'https://creativecommons.org/licenses/by-nc-sa/4.0/',
 			'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by-nc-sa.png',
 		),
 		'cc-0' => array(
@@ -883,7 +884,13 @@ abstract class Installer {
 		}
 
 		if ( !$caches ) {
-			$this->showMessage( 'config-no-cache' );
+			$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';
+			}
+			$this->showMessage( $key );
 		}
 
 		$this->setVar( '_Caches', $caches );