summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/DefaultSettings.php2
-rw-r--r--includes/installer/Installer.php7
2 files changed, 8 insertions, 1 deletions
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();