From 45b4484864b492a40570e99a9f5c87d2512cc6ad Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 1 Nov 2014 07:47:43 +0100 Subject: Update to MediaWiki 1.22.13 --- RELEASE-NOTES-1.22 | 7 +++++++ includes/DefaultSettings.php | 2 +- includes/installer/Installer.php | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index 34292e1f..9602c710 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -3,6 +3,13 @@ Security reminder: MediaWiki does not require PHP's register_globals. If you have it on, turn it '''off''' if you can. +== MediaWiki 1.22.13 == + +This is a maintenance release of the MediaWiki 1.22 branch. + +=== Changes since 1.22.12 === +* (Bug 67440) Allow classes to be registered properly from installer + == MediaWiki 1.22.12 == This is a security release of the MediaWiki 1.22 branch. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 84374c42..df3d57b9 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -63,7 +63,7 @@ $wgConf = new SiteConfiguration; * MediaWiki version number * @since 1.2 */ -$wgVersion = '1.22.12'; +$wgVersion = '1.22.13'; /** * Name of the site. It must be changed in LocalSettings.php diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index f248d859..a9908134 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -515,6 +515,13 @@ abstract class Installer { public static function getExistingLocalSettings() { global $IP; + // You might be wondering why this is here. Well if you don't do this + // then some poorly-formed extensions try to call their own classes + // after immediately registering them. We really need to get extension + // registration out of the global scope and into a real format. + // @see https://bugzilla.wikimedia.org/67440 + global $wgAutoloadClasses; + wfSuppressWarnings(); $_lsExists = file_exists( "$IP/LocalSettings.php" ); wfRestoreWarnings(); -- cgit v1.2.2