Jeroen De Dauw has submitted this change and it was merged.
Change subject: Move Specials related files into /specials/ subdirectory
......................................................................
Move Specials related files into /specials/ subdirectory
Following MW convention, move files into /specials/ subdirectory
Change-Id: I4410d1e6b0e8ce22c8097cbacbc93a1ac21ff181
---
R includes/SMW_QueryPage.php
M includes/Setup.php
R includes/specials/SMW_QuerySpecialPage.php
R includes/specials/SMW_QueryUI.php
R includes/specials/SMW_QueryUIHelper.php
R includes/specials/SMW_SpecialAsk.php
R includes/specials/SMW_SpecialBrowse.php
R includes/specials/SMW_SpecialOWLExport.php
R includes/specials/SMW_SpecialPageProperty.php
R includes/specials/SMW_SpecialProperties.php
R includes/specials/SMW_SpecialQueryCreator.php
R includes/specials/SMW_SpecialSMWAdmin.php
R includes/specials/SMW_SpecialSearchByProperty.php
R includes/specials/SMW_SpecialTypes.php
R includes/specials/SMW_SpecialURIResolver.php
R includes/specials/SMW_SpecialUnusedProperties.php
R includes/specials/SMW_SpecialWantedProperties.php
17 files changed, 18 insertions(+), 19 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/QueryPages/SMW_QueryPage.php b/includes/SMW_QueryPage.php
similarity index 100%
rename from specials/QueryPages/SMW_QueryPage.php
rename to includes/SMW_QueryPage.php
diff --git a/includes/Setup.php b/includes/Setup.php
index eeda4a4..f0091ab 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -127,6 +127,7 @@
$wgAutoloadClasses['SMWQueryLanguage'] = $incDir .
'SMW_QueryLanguage.php';
$wgAutoloadClasses['SMWSemanticData'] = $incDir .
'SMW_SemanticData.php';
$wgAutoloadClasses['SMWPageLister'] = $incDir .
'SMW_PageLister.php';
+ $wgAutoloadClasses['SMWQueryPage'] = $incDir .
'SMW_QueryPage.php';
$wgAutoloadClasses['SMWDataValueFactory'] = $incDir .
'DataValueFactory.php';
$wgAutoloadClasses['SMW\DataValueFactory'] = $incDir .
'DataValueFactory.php';
@@ -306,26 +307,24 @@
$wgAutoloadClasses['SMWDIHandlerGeoCoord'] = $stoDirSQL .
'SMW_DIHandler_GeoCoord.php';
// Special pages and closely related helper classes
- $speDir = $smwgIP . 'includes/specials/';
- $wgAutoloadClasses['SMW\SpecialSemanticStatistics'] = $speDir .
'SpecialSemanticStatistics.php';
+ $specDir = $smwgIP . 'includes/specials/';
+ $wgAutoloadClasses['SMW\SpecialSemanticStatistics'] = $specDir .
'SpecialSemanticStatistics.php';
- $specDir = $smwgIP . 'specials/';
- $wgAutoloadClasses['SMWQueryPage'] = $specDir .
'QueryPages/SMW_QueryPage.php';
- $wgAutoloadClasses['SMWAskPage'] = $specDir .
'AskSpecial/SMW_SpecialAsk.php';
- $wgAutoloadClasses['SMWQueryUIHelper'] = $specDir .
'AskSpecial/SMW_QueryUIHelper.php';
- $wgAutoloadClasses['SMWQueryUI'] = $specDir .
'AskSpecial/SMW_QueryUI.php';
- $wgAutoloadClasses['SMWQueryCreatorPage'] = $specDir .
'AskSpecial/SMW_SpecialQueryCreator.php';
- $wgAutoloadClasses['SMWQuerySpecialPage'] = $specDir .
'AskSpecial/SMW_QuerySpecialPage.php';
- $wgAutoloadClasses['SMWSpecialBrowse'] = $specDir .
'SearchTriple/SMW_SpecialBrowse.php';
- $wgAutoloadClasses['SMWPageProperty'] = $specDir .
'SearchTriple/SMW_SpecialPageProperty.php';
- $wgAutoloadClasses['SMWSearchByProperty'] = $specDir .
'SearchTriple/SMW_SpecialSearchByProperty.php';
- $wgAutoloadClasses['SMWURIResolver'] = $specDir .
'URIResolver/SMW_SpecialURIResolver.php';
- $wgAutoloadClasses['SMWAdmin'] = $specDir .
'SMWAdmin/SMW_SpecialSMWAdmin.php';
- $wgAutoloadClasses['SMWSpecialOWLExport'] = $specDir .
'Export/SMW_SpecialOWLExport.php';
- $wgAutoloadClasses['SMWSpecialProperties'] = $specDir .
'QueryPages/SMW_SpecialProperties.php';
- $wgAutoloadClasses['SMWSpecialTypes'] = $specDir .
'QueryPages/SMW_SpecialTypes.php';
- $wgAutoloadClasses['SMWSpecialUnusedProperties'] = $specDir .
'QueryPages/SMW_SpecialUnusedProperties.php';
- $wgAutoloadClasses['SMWSpecialWantedProperties'] = $specDir .
'QueryPages/SMW_SpecialWantedProperties.php';
+ $wgAutoloadClasses['SMWAskPage'] = $specDir .
'SMW_SpecialAsk.php';
+ $wgAutoloadClasses['SMWQueryUIHelper'] = $specDir .
'SMW_QueryUIHelper.php';
+ $wgAutoloadClasses['SMWQueryUI'] = $specDir .
'SMW_QueryUI.php';
+ $wgAutoloadClasses['SMWQueryCreatorPage'] = $specDir .
'SMW_SpecialQueryCreator.php';
+ $wgAutoloadClasses['SMWQuerySpecialPage'] = $specDir .
'SMW_QuerySpecialPage.php';
+ $wgAutoloadClasses['SMWSpecialBrowse'] = $specDir .
'SMW_SpecialBrowse.php';
+ $wgAutoloadClasses['SMWPageProperty'] = $specDir .
'SMW_SpecialPageProperty.php';
+ $wgAutoloadClasses['SMWSearchByProperty'] = $specDir .
'SMW_SpecialSearchByProperty.php';
+ $wgAutoloadClasses['SMWURIResolver'] = $specDir .
'SMW_SpecialURIResolver.php';
+ $wgAutoloadClasses['SMWAdmin'] = $specDir .
'SMW_SpecialSMWAdmin.php';
+ $wgAutoloadClasses['SMWSpecialOWLExport'] = $specDir .
'SMW_SpecialOWLExport.php';
+ $wgAutoloadClasses['SMWSpecialProperties'] = $specDir .
'SMW_SpecialProperties.php';
+ $wgAutoloadClasses['SMWSpecialTypes'] = $specDir .
'SMW_SpecialTypes.php';
+ $wgAutoloadClasses['SMWSpecialUnusedProperties'] = $specDir .
'SMW_SpecialUnusedProperties.php';
+ $wgAutoloadClasses['SMWSpecialWantedProperties'] = $specDir .
'SMW_SpecialWantedProperties.php';
// Special pages and closely related helper classes
$testsDir = $smwgIP . 'tests/phpunit/';
diff --git a/specials/AskSpecial/SMW_QuerySpecialPage.php
b/includes/specials/SMW_QuerySpecialPage.php
similarity index 100%
rename from specials/AskSpecial/SMW_QuerySpecialPage.php
rename to includes/specials/SMW_QuerySpecialPage.php
diff --git a/specials/AskSpecial/SMW_QueryUI.php
b/includes/specials/SMW_QueryUI.php
similarity index 100%
rename from specials/AskSpecial/SMW_QueryUI.php
rename to includes/specials/SMW_QueryUI.php
diff --git a/specials/AskSpecial/SMW_QueryUIHelper.php
b/includes/specials/SMW_QueryUIHelper.php
similarity index 100%
rename from specials/AskSpecial/SMW_QueryUIHelper.php
rename to includes/specials/SMW_QueryUIHelper.php
diff --git a/specials/AskSpecial/SMW_SpecialAsk.php
b/includes/specials/SMW_SpecialAsk.php
similarity index 100%
rename from specials/AskSpecial/SMW_SpecialAsk.php
rename to includes/specials/SMW_SpecialAsk.php
diff --git a/specials/SearchTriple/SMW_SpecialBrowse.php
b/includes/specials/SMW_SpecialBrowse.php
similarity index 100%
rename from specials/SearchTriple/SMW_SpecialBrowse.php
rename to includes/specials/SMW_SpecialBrowse.php
diff --git a/specials/Export/SMW_SpecialOWLExport.php
b/includes/specials/SMW_SpecialOWLExport.php
similarity index 100%
rename from specials/Export/SMW_SpecialOWLExport.php
rename to includes/specials/SMW_SpecialOWLExport.php
diff --git a/specials/SearchTriple/SMW_SpecialPageProperty.php
b/includes/specials/SMW_SpecialPageProperty.php
similarity index 100%
rename from specials/SearchTriple/SMW_SpecialPageProperty.php
rename to includes/specials/SMW_SpecialPageProperty.php
diff --git a/specials/QueryPages/SMW_SpecialProperties.php
b/includes/specials/SMW_SpecialProperties.php
similarity index 100%
rename from specials/QueryPages/SMW_SpecialProperties.php
rename to includes/specials/SMW_SpecialProperties.php
diff --git a/specials/AskSpecial/SMW_SpecialQueryCreator.php
b/includes/specials/SMW_SpecialQueryCreator.php
similarity index 100%
rename from specials/AskSpecial/SMW_SpecialQueryCreator.php
rename to includes/specials/SMW_SpecialQueryCreator.php
diff --git a/specials/SMWAdmin/SMW_SpecialSMWAdmin.php
b/includes/specials/SMW_SpecialSMWAdmin.php
similarity index 100%
rename from specials/SMWAdmin/SMW_SpecialSMWAdmin.php
rename to includes/specials/SMW_SpecialSMWAdmin.php
diff --git a/specials/SearchTriple/SMW_SpecialSearchByProperty.php
b/includes/specials/SMW_SpecialSearchByProperty.php
similarity index 100%
rename from specials/SearchTriple/SMW_SpecialSearchByProperty.php
rename to includes/specials/SMW_SpecialSearchByProperty.php
diff --git a/specials/QueryPages/SMW_SpecialTypes.php
b/includes/specials/SMW_SpecialTypes.php
similarity index 100%
rename from specials/QueryPages/SMW_SpecialTypes.php
rename to includes/specials/SMW_SpecialTypes.php
diff --git a/specials/URIResolver/SMW_SpecialURIResolver.php
b/includes/specials/SMW_SpecialURIResolver.php
similarity index 100%
rename from specials/URIResolver/SMW_SpecialURIResolver.php
rename to includes/specials/SMW_SpecialURIResolver.php
diff --git a/specials/QueryPages/SMW_SpecialUnusedProperties.php
b/includes/specials/SMW_SpecialUnusedProperties.php
similarity index 100%
rename from specials/QueryPages/SMW_SpecialUnusedProperties.php
rename to includes/specials/SMW_SpecialUnusedProperties.php
diff --git a/specials/QueryPages/SMW_SpecialWantedProperties.php
b/includes/specials/SMW_SpecialWantedProperties.php
similarity index 100%
rename from specials/QueryPages/SMW_SpecialWantedProperties.php
rename to includes/specials/SMW_SpecialWantedProperties.php
--
To view, visit https://gerrit.wikimedia.org/r/61264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4410d1e6b0e8ce22c8097cbacbc93a1ac21ff181
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Mwjames <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits