From 8e0ac8db6311a8c4b57dc62917e70cde9ec2fa4c Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Mon, 25 Apr 2011 21:33:38 +0000 Subject: [PATCH] Move 3 files into cache directory Move in AutoLoader to cache section also --- includes/AutoLoader.php | 22 ++++++++++++---------- includes/{ => cache}/CacheDependency.php | 0 includes/{ => cache}/HTMLCacheUpdate.php | 0 includes/{ => cache}/HTMLFileCache.php | 0 4 files changed, 12 insertions(+), 10 deletions(-) rename includes/{ => cache}/CacheDependency.php (100%) rename includes/{ => cache}/HTMLCacheUpdate.php (100%) rename includes/{ => cache}/HTMLFileCache.php (100%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index b56929501a..a52454386a 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -27,7 +27,6 @@ $wgAutoloadLocalClasses = array( 'BadTitle' => 'includes/Title.php', 'BaseTemplate' => 'includes/SkinTemplate.php', 'Block' => 'includes/Block.php', - 'CacheDependency' => 'includes/CacheDependency.php', 'Category' => 'includes/Category.php', 'Categoryfinder' => 'includes/Categoryfinder.php', 'CategoryPage' => 'includes/CategoryPage.php', @@ -48,11 +47,9 @@ $wgAutoloadLocalClasses = array( 'ConfEditor' => 'includes/ConfEditor.php', 'ConfEditorParseError' => 'includes/ConfEditor.php', 'ConfEditorToken' => 'includes/ConfEditor.php', - 'ConstantDependency' => 'includes/CacheDependency.php', 'Cookie' => 'includes/Cookie.php', 'CookieJar' => 'includes/Cookie.php', 'CreativeCommonsRdf' => 'includes/Metadata.php', - 'DependencyWrapper' => 'includes/CacheDependency.php', 'DiffHistoryBlob' => 'includes/HistoryBlob.php', 'DjVuImage' => 'includes/DjVuImage.php', 'DoubleReplacer' => 'includes/StringUtils.php', @@ -87,13 +84,11 @@ $wgAutoloadLocalClasses = array( 'FeedItem' => 'includes/Feed.php', 'FeedUtils' => 'includes/FeedUtils.php', 'FileDeleteForm' => 'includes/FileDeleteForm.php', - 'FileDependency' => 'includes/CacheDependency.php', 'FileRevertForm' => 'includes/FileRevertForm.php', 'ForkController' => 'includes/ForkController.php', 'FormOptions' => 'includes/FormOptions.php', 'FormSpecialPage' => 'includes/SpecialPage.php', 'GenderCache' => 'includes/GenderCache.php', - 'GlobalDependency' => 'includes/CacheDependency.php', 'HashtableReplacer' => 'includes/StringUtils.php', 'HistoryBlob' => 'includes/HistoryBlob.php', 'HistoryBlobCurStub' => 'includes/HistoryBlob.php', @@ -102,11 +97,8 @@ $wgAutoloadLocalClasses = array( 'HistoryPager' => 'includes/HistoryPage.php', 'Hooks' => 'includes/Hooks.php', 'Html' => 'includes/Html.php', - 'HTMLCacheUpdate' => 'includes/HTMLCacheUpdate.php', - 'HTMLCacheUpdateJob' => 'includes/HTMLCacheUpdate.php', 'HTMLCheckField' => 'includes/HTMLForm.php', 'HTMLEditTools' => 'includes/HTMLForm.php', - 'HTMLFileCache' => 'includes/HTMLFileCache.php', 'HTMLFloatField' => 'includes/HTMLForm.php', 'HTMLForm' => 'includes/HTMLForm.php', 'HTMLFormField' => 'includes/HTMLForm.php', @@ -229,8 +221,6 @@ $wgAutoloadLocalClasses = array( 'Title' => 'includes/Title.php', 'TitleArray' => 'includes/TitleArray.php', 'TitleArrayFromResult' => 'includes/TitleArray.php', - 'TitleDependency' => 'includes/CacheDependency.php', - 'TitleListDependency' => 'includes/CacheDependency.php', 'ThrottledError' => 'includes/Exception.php', 'UnlistedSpecialPage' => 'includes/SpecialPage.php', 'UppercaseCollation' => 'includes/Collation.php', @@ -356,6 +346,18 @@ $wgAutoloadLocalClasses = array( 'ApiUserrights' => 'includes/api/ApiUserrights.php', 'ApiWatch' => 'includes/api/ApiWatch.php', + # includes/cache + 'CacheDependency' => 'includes/cache/CacheDependency.php', + 'ConstantDependency' => 'includes/cache/CacheDependency.php', + 'DependencyWrapper' => 'includes/cache/CacheDependency.php', + 'FileDependency' => 'includes/cache/CacheDependency.php', + 'GlobalDependency' => 'includes/cache/CacheDependency.php', + 'HTMLCacheUpdate' => 'includes/cache/HTMLCacheUpdate.php', + 'HTMLCacheUpdateJob' => 'includes/cache/HTMLCacheUpdate.php', + 'HTMLFileCache' => 'includes/cache/HTMLFileCache.php', + 'TitleDependency' => 'includes/cache/CacheDependency.php', + 'TitleListDependency' => 'includes/cache/CacheDependency.php', + 'UsageException' => 'includes/api/ApiMain.php', # includes/db diff --git a/includes/CacheDependency.php b/includes/cache/CacheDependency.php similarity index 100% rename from includes/CacheDependency.php rename to includes/cache/CacheDependency.php diff --git a/includes/HTMLCacheUpdate.php b/includes/cache/HTMLCacheUpdate.php similarity index 100% rename from includes/HTMLCacheUpdate.php rename to includes/cache/HTMLCacheUpdate.php diff --git a/includes/HTMLFileCache.php b/includes/cache/HTMLFileCache.php similarity index 100% rename from includes/HTMLFileCache.php rename to includes/cache/HTMLFileCache.php -- 2.20.1