From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 31 Oct 2014 09:33:40 +0000 (+0100)
Subject: Allow /-/ in MediaWikiVersionFetcher::fetchVersion
X-Git-Tag: 1.31.0-rc.0~13427^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=2124c780a82c5fff6795294dccaa1c35be87e232;p=lhc%2Fweb%2Fwiklou.git

Allow /-/ in MediaWikiVersionFetcher::fetchVersion

Alters MediaWikiVersionFetcher::fetchVersion() so that tests allow
versions to use Semantic Versioning (http://semver.org/)

See I2255ac2999ad207203fa6514f2e1b23f5d7965d7 for the fix in REL1_24

Change-Id: I6e9e154f864e771a02ae1da0e1530afe7f8a4cd0
---

diff --git a/includes/MediaWikiVersionFetcher.php b/includes/MediaWikiVersionFetcher.php
index 17cb8aa451..c3fb4869ad 100644
--- a/includes/MediaWikiVersionFetcher.php
+++ b/includes/MediaWikiVersionFetcher.php
@@ -19,7 +19,7 @@ class MediaWikiVersionFetcher {
 		$defaultSettings = file_get_contents( __DIR__ . '/DefaultSettings.php' );
 
 		$matches = array();
-		preg_match( "/wgVersion = '([0-9a-zA-Z\.]+)';/", $defaultSettings, $matches );
+		preg_match( "/wgVersion = '([0-9a-zA-Z\.\-]+)';/", $defaultSettings, $matches );
 
 		if ( count( $matches ) !== 2 ) {
 			throw new RuntimeException( 'Could not extract the MediaWiki version from DefaultSettings.php' );