X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=d3333558c77af032605aa692e3ccfbf5262343fc;hb=e4dbcc3580807705b98e407ec7be52163945195b;hp=987925c747a413f82a4082d9dadbc4637113e644;hpb=be8170b5f32dd5d9567cbda2a54ceb8437fe74bf;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 987925c747..d3333558c7 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -286,27 +286,27 @@ abstract class Installer {
 	public $licenses = array(
 		'cc-by' => array(
 			'url' => 'http://creativecommons.org/licenses/by/3.0/',
-			'icon' => '{$wgStylePath}/common/images/cc-by.png',
+			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/cc-by.png',
 		),
 		'cc-by-sa' => array(
 			'url' => 'http://creativecommons.org/licenses/by-sa/3.0/',
-			'icon' => '{$wgStylePath}/common/images/cc-by-sa.png',
+			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/cc-by-sa.png',
 		),
 		'cc-by-nc-sa' => array(
 			'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
-			'icon' => '{$wgStylePath}/common/images/cc-by-nc-sa.png',
+			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/cc-by-nc-sa.png',
 		),
 		'cc-0' => array(
 			'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
-			'icon' => '{$wgStylePath}/common/images/cc-0.png',
+			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/cc-0.png',
 		),
 		'pd' => array(
 			'url' => '',
-			'icon' => '{$wgStylePath}/common/images/public-domain.png',
+			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/public-domain.png',
 		),
 		'gfdl' => array(
 			'url' => 'http://www.gnu.org/copyleft/fdl.html',
-			'icon' => '{$wgStylePath}/common/images/gnu-fdl.png',
+			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/gnu-fdl.png',
 		),
 		'none' => array(
 			'url' => '',
@@ -898,11 +898,12 @@ abstract class Installer {
 	}
 
 	/**
-	 * Scare user to death if they have mod_security
+	 * Scare user to death if they have mod_security or mod_security2
 	 * @return bool
 	 */
 	protected function envCheckModSecurity() {
-		if ( self::apacheModulePresent( 'mod_security' ) ) {
+		if ( self::apacheModulePresent( 'mod_security' )
+			|| self::apacheModulePresent( 'mod_security2' ) ) {
 			$this->showMessage( 'config-mod-security' );
 		}
 
@@ -1468,6 +1469,22 @@ abstract class Installer {
 		return $exts;
 	}
 
+	/**
+	 * Returns a default value to be used for $wgDefaultSkin: the preferred skin, if available among
+	 * the installed skins, or any other one otherwise.
+	 *
+	 * @param string[] $skinNames Names of installed skins.
+	 * @return string
+	 */
+	public function getDefaultSkin( array $skinNames ) {
+		$defaultSkin = $GLOBALS['wgDefaultSkin'];
+		if ( in_array( $defaultSkin, $skinNames ) ) {
+			return $defaultSkin;
+		} else {
+			return $skinNames[0];
+		}
+	}
+
 	/**
 	 * Installs the auto-detected extensions.
 	 *