Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/203101

Change subject: Add extension.json
......................................................................

Add extension.json

Bug: T87913
Change-Id: If8718c9f798d890f1a5d8f6bbd6a4f180a7efd4e
---
M ExtensionDistributor.php
A extension.json
M specials/SpecialBaseDistributor.php
3 files changed, 65 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor 
refs/changes/01/203101/1

diff --git a/ExtensionDistributor.php b/ExtensionDistributor.php
index 5a08611..44da6f3 100644
--- a/ExtensionDistributor.php
+++ b/ExtensionDistributor.php
@@ -53,6 +53,11 @@
        'master',
 );
 
+/**
+ * Snapshot branch/tag to default to
+ */
+$wgExtDistDefaultSnapshot = 'master';
+
 /********************
  * Registration
  */
diff --git a/extension.json b/extension.json
new file mode 100644
index 0000000..78930b7
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,54 @@
+{
+       "name": "Extension Distributor",
+       "author": [
+               "Tim Starling",
+               "Sam Reed",
+               "Chad Horohoe",
+               "Kunal Mehta"
+       ],
+       "url": "https://www.mediawiki.org/wiki/Extension:ExtensionDistributor";,
+       "descriptionmsg": "extensiondistributor-desc",
+       "type": "specialpage",
+       "SpecialPages": {
+               "ExtensionDistributor": "SpecialExtensionDistributor",
+               "SkinDistributor": "SpecialSkinDistributor"
+       },
+       "SpecialPageGroups": {
+               "ExtensionDistributor": "developer",
+               "SkinDistributor": "developer"
+       },
+       "APIListModules": {
+               "extdistrepos": "ApiListExtDistRepos"
+       },
+       "MessagesDirs": {
+               "ExtensionDistributor": [
+                       "i18n"
+               ]
+       },
+       "ExtensionMessagesFiles": {
+               "ExtensionDistributorAliases": "ExtensionDistributor.alias.php"
+       },
+       "AutoloadClasses": {
+               "ExtensionDistributorHooks": "ExtensionDistributor.hooks.php",
+               "SpecialBaseDistributor": "specials/SpecialBaseDistributor.php",
+               "SpecialExtensionDistributor": 
"specials/SpecialExtensionDistributor.php",
+               "SpecialSkinDistributor": "specials/SpecialSkinDistributor.php",
+               "ExtDistProvider": "providers/ExtDistProvider.php",
+               "GerritExtDistProvider": "providers/GerritExtDistProvider.php",
+               "GithubExtDistProvider": "providers/GithubExtDistProvider.php",
+               "ApiListExtDistRepos": "api/ApiListExtDistRepos.php"
+       },
+       "Hooks": {
+               "APIQuerySiteInfoGeneralInfo": [
+                       
"ExtensionDistributorHooks::onAPIQuerySiteInfoGeneralInfo"
+               ]
+       },
+       "config": {
+               "ExtDistAPIConfig": false,
+               "ExtDistListFile": false,
+               "ExtDistSnapshotRefs": [
+                       "master"
+               ],
+               "ExtDistDefaultSnapshot": "master"
+       }
+}
diff --git a/specials/SpecialBaseDistributor.php 
b/specials/SpecialBaseDistributor.php
index c7e4efa..2c413b3 100644
--- a/specials/SpecialBaseDistributor.php
+++ b/specials/SpecialBaseDistributor.php
@@ -128,7 +128,7 @@
         * @return mixed
         */
        protected function showVersionSelector( $repoName ) {
-               global $wgExtDistSnapshotRefs;
+               global $wgExtDistSnapshotRefs, $wgExtDistDefaultSnapshot;
 
                if ( !$wgExtDistSnapshotRefs ) {
                        // extdist-no-versions-extensions, 
extdist-no-versions-skins
@@ -157,7 +157,11 @@
                        if ( $this->getProvider()->hasBranch( $repoName, 
$branchName ) ) {
                                $branchMsg = $this->msg( 
"extdist-branch-$branchName" );
                                $branchDesc = $branchMsg->isDisabled() ? 
$branchName : $branchMsg->plain();
-                               $html .= Xml::option( $branchDesc, $branchName, 
($selected == 1) );
+                               $html .= Xml::option(
+                                       $branchDesc,
+                                       $branchName,
+                                       ( $branchName === 
$wgExtDistDefaultSnapshot )
+                               );
                                $selected++;
                        }
                }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8718c9f798d890f1a5d8f6bbd6a4f180a7efd4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to