jenkins-bot has submitted this change and it was merged. Change subject: Move files into an includes folder ......................................................................
Move files into an includes folder This is the standard way of doing this and makes the extension's root much less messy. Change-Id: If25eae8fa99ea88fae3d9a5de34f4591dc0f7dfc --- M GlobalBlocking.php R includes/GlobalBlocking.class.php R includes/api/ApiGlobalBlock.php R includes/api/ApiQueryGlobalBlocks.php R includes/specials/SpecialGlobalBlock.php R includes/specials/SpecialGlobalBlockList.php R includes/specials/SpecialGlobalBlockStatus.php R includes/specials/SpecialRemoveGlobalBlock.php 8 files changed, 9 insertions(+), 9 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/GlobalBlocking.php b/GlobalBlocking.php index b1a06fc..6305420 100644 --- a/GlobalBlocking.php +++ b/GlobalBlocking.php @@ -16,7 +16,7 @@ * @author Andrew Garrett <and...@epstone.net> * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ -$dir = dirname( __FILE__ ); +$dir = __DIR__; $wgExtensionCredits['other'][] = array( 'path' => __FILE__, 'name' => 'GlobalBlocking', @@ -36,21 +36,21 @@ $wgHooks['SpecialContributionsBeforeMainOutput'][] = 'GlobalBlocking::onSpecialContributionsBeforeMainOutput'; $wgHooks['UserMergeAccountFields'][] = 'GlobalBlocking::onUserMergeAccountFields'; -$wgAutoloadClasses['SpecialGlobalBlock'] = "$dir/SpecialGlobalBlock.php"; +$wgAutoloadClasses['SpecialGlobalBlock'] = "$dir/includes/specials/SpecialGlobalBlock.php"; $wgSpecialPages['GlobalBlock'] = 'SpecialGlobalBlock'; -$wgAutoloadClasses['SpecialGlobalBlockList'] = "$dir/SpecialGlobalBlockList.php"; -$wgAutoloadClasses['GlobalBlockListPager'] = "$dir/SpecialGlobalBlockList.php"; +$wgAutoloadClasses['SpecialGlobalBlockList'] = "$dir/includes/specials/SpecialGlobalBlockList.php"; +$wgAutoloadClasses['GlobalBlockListPager'] = "$dir/includes/specials/SpecialGlobalBlockList.php"; $wgSpecialPages['GlobalBlockList'] = 'SpecialGlobalBlockList'; -$wgAutoloadClasses['SpecialGlobalBlockStatus'] = "$dir/SpecialGlobalBlockStatus.php"; +$wgAutoloadClasses['SpecialGlobalBlockStatus'] = "$dir/includes/specials/SpecialGlobalBlockStatus.php"; $wgSpecialPages['GlobalBlockStatus'] = 'SpecialGlobalBlockStatus'; -$wgAutoloadClasses['SpecialRemoveGlobalBlock'] = "$dir/SpecialRemoveGlobalBlock.php"; +$wgAutoloadClasses['SpecialRemoveGlobalBlock'] = "$dir/includes/specials/SpecialRemoveGlobalBlock.php"; $wgSpecialPages['RemoveGlobalBlock'] = 'SpecialRemoveGlobalBlock'; -$wgAutoloadClasses['ApiQueryGlobalBlocks'] = "$dir/ApiQueryGlobalBlocks.php"; +$wgAutoloadClasses['ApiQueryGlobalBlocks'] = "$dir/includes/api/ApiQueryGlobalBlocks.php"; $wgAPIListModules['globalblocks'] = 'ApiQueryGlobalBlocks'; -$wgAutoloadClasses['ApiGlobalBlock'] = "$dir/ApiGlobalBlock.php"; +$wgAutoloadClasses['ApiGlobalBlock'] = "$dir/includes/api/ApiGlobalBlock.php"; $wgAPIModules['globalblock'] = 'ApiGlobalBlock'; -$wgAutoloadClasses['GlobalBlocking'] = "$dir/GlobalBlocking.class.php"; +$wgAutoloadClasses['GlobalBlocking'] = "$dir/includes/GlobalBlocking.class.php"; $wgSpecialPageGroups['GlobalBlock'] = 'users'; $wgSpecialPageGroups['GlobalBlockList'] = 'users'; diff --git a/GlobalBlocking.class.php b/includes/GlobalBlocking.class.php similarity index 100% rename from GlobalBlocking.class.php rename to includes/GlobalBlocking.class.php diff --git a/ApiGlobalBlock.php b/includes/api/ApiGlobalBlock.php similarity index 100% rename from ApiGlobalBlock.php rename to includes/api/ApiGlobalBlock.php diff --git a/ApiQueryGlobalBlocks.php b/includes/api/ApiQueryGlobalBlocks.php similarity index 100% rename from ApiQueryGlobalBlocks.php rename to includes/api/ApiQueryGlobalBlocks.php diff --git a/SpecialGlobalBlock.php b/includes/specials/SpecialGlobalBlock.php similarity index 100% rename from SpecialGlobalBlock.php rename to includes/specials/SpecialGlobalBlock.php diff --git a/SpecialGlobalBlockList.php b/includes/specials/SpecialGlobalBlockList.php similarity index 100% rename from SpecialGlobalBlockList.php rename to includes/specials/SpecialGlobalBlockList.php diff --git a/SpecialGlobalBlockStatus.php b/includes/specials/SpecialGlobalBlockStatus.php similarity index 100% rename from SpecialGlobalBlockStatus.php rename to includes/specials/SpecialGlobalBlockStatus.php diff --git a/SpecialRemoveGlobalBlock.php b/includes/specials/SpecialRemoveGlobalBlock.php similarity index 100% rename from SpecialRemoveGlobalBlock.php rename to includes/specials/SpecialRemoveGlobalBlock.php -- To view, visit https://gerrit.wikimedia.org/r/164769 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If25eae8fa99ea88fae3d9a5de34f4591dc0f7dfc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalBlocking Gerrit-Branch: master Gerrit-Owner: Hoo man <h...@online.de> Gerrit-Reviewer: Alex Monk <kren...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
