diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-18 06:04:58 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-18 06:04:58 +0100 |
| commit | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (patch) | |
| tree | f8c25e7fa0c2ba18f27c52415c19cb579a316178 /includes/Setup.php | |
| parent | a1789ddde42033f1b05cc4929491214ee6e79383 (diff) | |
Update to MediaWiki 1.26.1
Diffstat (limited to 'includes/Setup.php')
| -rw-r--r-- | includes/Setup.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/includes/Setup.php b/includes/Setup.php index 70e8cde4..905a1d10 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -510,6 +510,21 @@ MWExceptionHandler::installHandler(); require_once "$IP/includes/compat/normal/UtfNormalUtil.php"; + +$ps_validation = Profiler::instance()->scopedProfileIn( $fname . '-validation' ); + +// T48998: Bail out early if $wgArticlePath is non-absolute +if ( !preg_match( '/^(https?:\/\/|\/)/', $wgArticlePath ) ) { + throw new FatalError( + 'If you use a relative URL for $wgArticlePath, it must start ' . + 'with a slash (<code>/</code>).<br><br>See ' . + '<a href="https://www.mediawiki.org/wiki/Manual:$wgArticlePath">' . + 'https://www.mediawiki.org/wiki/Manual:$wgArticlePath</a>.' + ); +} + +Profiler::instance()->scopedProfileOut( $ps_validation ); + $ps_default2 = Profiler::instance()->scopedProfileIn( $fname . '-defaults2' ); if ( $wgScriptExtension !== '.php' || defined( 'MW_ENTRY_PHP5' ) ) { |