MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/339585 )

Change subject: Move files into subdirectories
......................................................................

Move files into subdirectories

Bug: T154047
Change-Id: I3229575e7efccb2ed4105bd00b1083092d6fe7f7
---
M extension.json
R includes/ApiQueryGlobalUsage.php
R includes/GlobalUsage.php
R includes/GlobalUsageCachePurgeJob.php
R includes/GlobalUsageHooks.php
R includes/GlobalUsageImagePageHooks.php
R includes/GlobalUsageQuery.php
R includes/SpecialGlobalUsage.php
R includes/SpecialGloballyWantedFiles.php
R includes/SpecialMostGloballyLinkedFiles.php
R patches/GlobalUsage.pg.sql
R patches/GlobalUsage.sql
12 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUsage 
refs/changes/85/339585/1

diff --git a/extension.json b/extension.json
index 9fc513b..6712f4a 100644
--- a/extension.json
+++ b/extension.json
@@ -26,15 +26,15 @@
                "GlobalUsageAliases": "GlobalUsage.alias.php"
        },
        "AutoloadClasses": {
-               "GlobalUsage": "GlobalUsage_body.php",
-               "GlobalUsageHooks": "GlobalUsageHooks.php",
-               "GlobalUsageImagePageHooks": "GlobalUsageImagePageHooks.php",
-               "SpecialGlobalUsage": "SpecialGlobalUsage.php",
-               "GlobalUsageQuery": "GlobalUsageQuery.php",
-               "ApiQueryGlobalUsage": "ApiQueryGlobalUsage.php",
-               "GlobalUsageCachePurgeJob": "GlobalUsageCachePurgeJob.php",
-               "MostGloballyLinkedFilesPage": 
"SpecialMostGloballyLinkedFiles.php",
-               "SpecialGloballyWantedFiles": "SpecialGloballyWantedFiles.php"
+               "GlobalUsage": "includes/GlobalUsage.php",
+               "GlobalUsageHooks": "includes/GlobalUsageHooks.php",
+               "GlobalUsageImagePageHooks": 
"includes/GlobalUsageImagePageHooks.php",
+               "SpecialGlobalUsage": "includes/SpecialGlobalUsage.php",
+               "GlobalUsageQuery": "includes/GlobalUsageQuery.php",
+               "ApiQueryGlobalUsage": "includes/ApiQueryGlobalUsage.php",
+               "GlobalUsageCachePurgeJob": 
"includes/GlobalUsageCachePurgeJob.php",
+               "MostGloballyLinkedFilesPage": 
"includes/SpecialMostGloballyLinkedFiles.php",
+               "SpecialGloballyWantedFiles": 
"includes/SpecialGloballyWantedFiles.php"
        },
        "@doc": [
                "Things that can cause link updates:",
diff --git a/ApiQueryGlobalUsage.php b/includes/ApiQueryGlobalUsage.php
similarity index 100%
rename from ApiQueryGlobalUsage.php
rename to includes/ApiQueryGlobalUsage.php
diff --git a/GlobalUsage_body.php b/includes/GlobalUsage.php
similarity index 100%
rename from GlobalUsage_body.php
rename to includes/GlobalUsage.php
diff --git a/GlobalUsageCachePurgeJob.php 
b/includes/GlobalUsageCachePurgeJob.php
similarity index 100%
rename from GlobalUsageCachePurgeJob.php
rename to includes/GlobalUsageCachePurgeJob.php
diff --git a/GlobalUsageHooks.php b/includes/GlobalUsageHooks.php
similarity index 95%
rename from GlobalUsageHooks.php
rename to includes/GlobalUsageHooks.php
index 3b88380..e8252c0 100644
--- a/GlobalUsageHooks.php
+++ b/includes/GlobalUsageHooks.php
@@ -202,18 +202,18 @@
         * @return bool
         */
        public static function onLoadExtensionSchemaUpdates( $updater = null ) {
-               $dir = dirname( __FILE__ );
+               $dir = dirname( __FILE__ ) . '/patches';
 
                if ( $updater->getDB()->getType() == 'mysql' || 
$updater->getDB()->getType() == 'sqlite' ) {
                        $updater->addExtensionUpdate( array( 'addTable', 
'globalimagelinks',
                                "$dir/GlobalUsage.sql", true ) );
                        $updater->addExtensionUpdate( array( 'addIndex', 
'globalimagelinks',
-                               'globalimagelinks_wiki_nsid_title', 
"$dir/patches/patch-globalimagelinks_wiki_nsid_title.sql", true ) );
+                               'globalimagelinks_wiki_nsid_title', 
"$dir/patch-globalimagelinks_wiki_nsid_title.sql", true ) );
                } elseif ( $updater->getDB()->getType() == 'postgresql' ) {
                        $updater->addExtensionUpdate( array( 'addTable', 
'globalimagelinks',
                                "$dir/GlobalUsage.pg.sql", true ) );
                        $updater->addExtensionUpdate( array( 'addIndex', 
'globalimagelinks',
-                               'globalimagelinks_wiki_nsid_title', 
"$dir/patches/patch-globalimagelinks_wiki_nsid_title.pg.sql", true ) );
+                               'globalimagelinks_wiki_nsid_title', 
"$dir/patch-globalimagelinks_wiki_nsid_title.pg.sql", true ) );
                }
                return true;
        }
diff --git a/GlobalUsageImagePageHooks.php 
b/includes/GlobalUsageImagePageHooks.php
similarity index 100%
rename from GlobalUsageImagePageHooks.php
rename to includes/GlobalUsageImagePageHooks.php
diff --git a/GlobalUsageQuery.php b/includes/GlobalUsageQuery.php
similarity index 100%
rename from GlobalUsageQuery.php
rename to includes/GlobalUsageQuery.php
diff --git a/SpecialGlobalUsage.php b/includes/SpecialGlobalUsage.php
similarity index 100%
rename from SpecialGlobalUsage.php
rename to includes/SpecialGlobalUsage.php
diff --git a/SpecialGloballyWantedFiles.php 
b/includes/SpecialGloballyWantedFiles.php
similarity index 100%
rename from SpecialGloballyWantedFiles.php
rename to includes/SpecialGloballyWantedFiles.php
diff --git a/SpecialMostGloballyLinkedFiles.php 
b/includes/SpecialMostGloballyLinkedFiles.php
similarity index 100%
rename from SpecialMostGloballyLinkedFiles.php
rename to includes/SpecialMostGloballyLinkedFiles.php
diff --git a/GlobalUsage.pg.sql b/patches/GlobalUsage.pg.sql
similarity index 100%
rename from GlobalUsage.pg.sql
rename to patches/GlobalUsage.pg.sql
diff --git a/GlobalUsage.sql b/patches/GlobalUsage.sql
similarity index 100%
rename from GlobalUsage.sql
rename to patches/GlobalUsage.sql

-- 
To view, visit https://gerrit.wikimedia.org/r/339585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3229575e7efccb2ed4105bd00b1083092d6fe7f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUsage
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to