diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
tree | f1fdd326034e05177596851be6a7127615d81498 /includes/MediaWikiVersionFetcher.php | |
parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/MediaWikiVersionFetcher.php')
-rw-r--r-- | includes/MediaWikiVersionFetcher.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/includes/MediaWikiVersionFetcher.php b/includes/MediaWikiVersionFetcher.php index 439e53f4..943bc9fc 100644 --- a/includes/MediaWikiVersionFetcher.php +++ b/includes/MediaWikiVersionFetcher.php @@ -4,7 +4,6 @@ * Provides access to MediaWiki's version without requiring MediaWiki (or anything else) * being loaded first. * - * @licence GNU GPL v2+ * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ class MediaWikiVersionFetcher { @@ -19,7 +18,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' ); |