From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 24 Sep 2014 15:59:08 +0000 (+0000)
Subject: Merge "Split SkinTemplate.php per-class"
X-Git-Tag: 1.31.0-rc.0~13845
X-Git-Url: http://git.cyclocoop.org//%27http:/ie7-js.googlecode.com/svn/test/index.html/%27?a=commitdiff_plain;h=b022afc009b8460e6a5f72653a1fd6021a68f67f;p=lhc%2Fweb%2Fwiklou.git

Merge "Split SkinTemplate.php per-class"
---

b022afc009b8460e6a5f72653a1fd6021a68f67f
diff --cc includes/AutoLoader.php
index 94f35e3fed,3e1127d984..3e36712454
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -945,12 -945,10 +945,12 @@@ $wgAutoloadLocalClasses = array
  	'SiteStore' => 'includes/site/SiteStore.php',
  
  	# includes/skins
- 	'BaseTemplate' => 'includes/skins/SkinTemplate.php',
- 	'MediaWikiI18N' => 'includes/skins/SkinTemplate.php',
- 	'QuickTemplate' => 'includes/skins/SkinTemplate.php',
+ 	'BaseTemplate' => 'includes/skins/BaseTemplate.php',
+ 	'MediaWikiI18N' => 'includes/skins/MediaWikiI18N.php',
+ 	'QuickTemplate' => 'includes/skins/QuickTemplate.php',
  	'Skin' => 'includes/skins/Skin.php',
 +	'SkinApi' => 'includes/skins/SkinApi.php',
 +	'SkinApiTemplate' => 'includes/skins/SkinApiTemplate.php',
  	'SkinException' => 'includes/skins/SkinException.php',
  	'SkinFactory' => 'includes/skins/SkinFactory.php',
  	'SkinFallback' => 'includes/skins/SkinFallback.php',