jenkins-bot has submitted this change and it was merged.
Change subject: Add a change tag to cross-wiki uploads
......................................................................
Add a change tag to cross-wiki uploads
Bug: T115328
Change-Id: I43deb5215fc5b5dfa2cbff27b074363c1def565b
(cherry picked from commit dec23b37102dc437f380037e35d0248446756bf7)
---
M WikimediaEvents.php
M WikimediaEventsHooks.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 47 insertions(+), 1 deletion(-)
Approvals:
Anomie: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/WikimediaEvents.php b/WikimediaEvents.php
index 08bb6b0..52954c3 100644
--- a/WikimediaEvents.php
+++ b/WikimediaEvents.php
@@ -163,5 +163,7 @@
$wgHooks['EditPageBeforeConflictDiff'][] =
'WikimediaEventsHooks::onEditPageBeforeConflictDiff';
$wgHooks['ResourceLoaderGetConfigVars'][] =
'WikimediaEventsHooks::onResourceLoaderGetConfigVars';
$wgHooks['ListDefinedTags'][] = 'WikimediaEventsHooks::onListDefinedTags';
+$wgHooks['ChangeTagsListActive'][] =
'WikimediaEventsHooks::onChangeTagsListActive';
$wgHooks['XAnalyticsSetHeader'][] = 'WikimediaEventsHooks::onXAnalyticsHeader';
$wgHooks['SpecialSearchResults'][] =
'WikimediaEventsHooks::onSpecialSearchResults';
+$wgHooks['UploadComplete'][] = 'WikimediaEventsHooks::onUploadComplete';
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index e1174a1..bd71292 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -322,13 +322,29 @@
}
/**
- * Register 'HHVM' change tag.
+ * Register change tags.
*
* @param array &$tags
* @return bool
*/
public static function onListDefinedTags( &$tags ) {
$tags[] = 'HHVM';
+ if ( wfWikiId() === 'commonswiki' ) {
+ $tags[] = 'cross-wiki-upload';
+ }
+ return true;
+ }
+
+ /**
+ * Mark active change tags.
+ *
+ * @param array &$tags
+ * @return bool
+ */
+ public static function onChangeTagsListActive( &$tags ) {
+ if ( wfWikiId() === 'commonswiki' ) {
+ $tags[] = 'cross-wiki-upload';
+ }
return true;
}
@@ -347,4 +363,28 @@
return true;
}
+
+ /**
+ * Add a change tag 'cross-wiki-upload' to cross-wiki uploads to
Commons, to track usage of the
+ * new feature. (Both to track adoption, and to let Commons editors
review the uploads.) (T115328)
+ */
+ public static function onUploadComplete( UploadBase $uploadBase ) {
+ if ( !defined( 'MW_API' ) ) {
+ return true;
+ }
+ if ( wfWikiId() !== 'commonswiki' ) {
+ return true;
+ }
+ $request = RequestContext::getMain()->getRequest();
+ if ( !$request->response()->getHeader(
'Access-Control-Allow-Origin' ) ) {
+ return true;
+ }
+
+ $revId =
$uploadBase->getLocalFile()->getTitle()->getLatestRevID( Title::GAID_FOR_UPDATE
);
+ DeferredUpdates::addCallableUpdate( function () use ( $revId ) {
+ ChangeTags::addTags( 'cross-wiki-upload', null, $revId
);
+ } );
+
+ return true;
+ }
}
diff --git a/i18n/en.json b/i18n/en.json
index 93381ee..bd9f4ec 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,6 +5,8 @@
]
},
"wikimediaevents-desc": "Logs Wikimedia-specific events using
EventLogging",
+ "tag-cross-wiki-upload": "Cross-wiki upload",
+ "tag-cross-wiki-upload-description": "Files uploaded from inside the
visual editor on other wikis",
"tag-HHVM": "[[mw:Special:MyLanguage/HHVM/About|HHVM]]",
"tag-HHVM-description": "Revisions made with the HipHop Virtual Machine
enabled instead of the Zend PHP interpreter (expected to improve performance,
tagged for debugging/analysis)"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6b65eca..735c37f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -6,6 +6,8 @@
]
},
"wikimediaevents-desc": "{{desc|name=Wikimedia
Events|url=https://www.mediawiki.org/wiki/Extension:WikimediaEvents}}";,
+ "tag-cross-wiki-upload": "Tag on cross-wiki uploads",
+ "tag-cross-wiki-upload-description": "Description for the
cross-wiki-upload tag.",
"tag-HHVM": "{{notranslate}} Tag on edits made via HHVM",
"tag-HHVM-description": "Description for the HHVM tag."
}
--
To view, visit https://gerrit.wikimedia.org/r/246701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43deb5215fc5b5dfa2cbff27b074363c1def565b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.27.0-wmf.3
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
