From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 25 Jan 2015 07:50:19 +0000 (-0800)
Subject: Removed old SqlBagOStuff alias
X-Git-Tag: 1.31.0-rc.0~12496
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=ac8d6b353850adfd69e40caa533125a37a24ba6e;p=lhc%2Fweb%2Fwiklou.git

Removed old SqlBagOStuff alias

Change-Id: I6fdd8791713ce9ed67473065332266c217284974
---

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index a864025bf0..3b7eef339f 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -40,6 +40,8 @@ production.
   rather than 'rsvg'.
 * Default value of $wgSVGConverters['ImageMagick'] now uses transparent
   background with white fallback color, rather than just white background.
+ * MediaWikiBagOStuff class removed, make sure any object cache config
+   uses SqlBagOStuff instead.
 
 === New features in 1.25 ===
 * (T64861) Updated plural rules to CLDR 26. Includes incompatible changes
diff --git a/autoload.php b/autoload.php
index 948a6aa421..5c515a0103 100644
--- a/autoload.php
+++ b/autoload.php
@@ -727,7 +727,6 @@ $wgAutoloadLocalClasses = array(
 	'MediaTransformError' => __DIR__ . '/includes/media/MediaTransformOutput.php',
 	'MediaTransformOutput' => __DIR__ . '/includes/media/MediaTransformOutput.php',
 	'MediaWiki' => __DIR__ . '/includes/MediaWiki.php',
-	'MediaWikiBagOStuff' => __DIR__ . '/includes/objectcache/SqlBagOStuff.php',
 	'MediaWikiI18N' => __DIR__ . '/includes/skins/MediaWikiI18N.php',
 	'MediaWikiPageLinkRenderer' => __DIR__ . '/includes/title/MediaWikiPageLinkRenderer.php',
 	'MediaWikiSite' => __DIR__ . '/includes/site/MediaWikiSite.php',
diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php
index 98cb2842aa..03b0166b6a 100644
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -780,9 +780,3 @@ class SqlBagOStuff extends BagOStuff {
 		}
 	}
 }
-
-/**
- * Backwards compatibility alias
- */
-class MediaWikiBagOStuff extends SqlBagOStuff {
-}