jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikidata, fix aliases edit button
......................................................................
Update Wikidata, fix aliases edit button
This fixes the issue of JavaScript not being initialized
for the aliases 'edit' button.
Change-Id: I923bbfc264454e07d3cfe6c1817fcfd270f61eda
---
M composer.lock
M extensions/Wikibase/build/travis/install.sh
M extensions/Wikibase/build/travis/mw-apply-wb-settings.sh
M extensions/Wikibase/build/travis/script.sh
M extensions/Wikibase/build/travis/update-db.sh
M extensions/Wikibase/repo/includes/View/FingerprintView.php
M vendor/composer/installed.json
7 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 7c4677f..74675af 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1205,7 +1205,7 @@
"source": {
"type": "git",
"url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "a26ed1827d63aef79bd9c12b172b33437e2d194d"
+ "reference": "bd11aff9c9fed495317e7a8b1134e917a2952031"
},
"require": {
"data-values/common": "~0.2.0",
@@ -1273,7 +1273,7 @@
"issues": "https://bugzilla.wikimedia.org/";,
"irc": "irc://irc.freenode.net/wikidata"
},
- "time": "2014-10-29 12:42:25"
+ "time": "2014-10-29 14:54:52"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/build/travis/install.sh
b/extensions/Wikibase/build/travis/install.sh
old mode 100644
new mode 100755
diff --git a/extensions/Wikibase/build/travis/mw-apply-wb-settings.sh
b/extensions/Wikibase/build/travis/mw-apply-wb-settings.sh
old mode 100644
new mode 100755
diff --git a/extensions/Wikibase/build/travis/script.sh
b/extensions/Wikibase/build/travis/script.sh
old mode 100644
new mode 100755
diff --git a/extensions/Wikibase/build/travis/update-db.sh
b/extensions/Wikibase/build/travis/update-db.sh
old mode 100644
new mode 100755
diff --git a/extensions/Wikibase/repo/includes/View/FingerprintView.php
b/extensions/Wikibase/repo/includes/View/FingerprintView.php
index 18c7f4a..2563090 100644
--- a/extensions/Wikibase/repo/includes/View/FingerprintView.php
+++ b/extensions/Wikibase/repo/includes/View/FingerprintView.php
@@ -138,8 +138,7 @@
*/
private function getHtmlForAliases( AliasGroupList $aliasGroups,
EntityId $entityId = null, $editable ) {
$hasAliases = $aliasGroups->hasGroupForLanguage(
$this->languageCode );
- $action = $hasAliases ? 'edit' : 'add';
- $editSection = $this->getHtmlForEditSection( 'SetAliases',
$entityId, $editable, $action );
+ $editSection = $this->getHtmlForEditSection( 'SetAliases',
$entityId, $editable, 'edit' );
if ( $hasAliases ) {
$aliasesHtml = '';
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 276a290..5a87758 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1295,7 +1295,7 @@
"source": {
"type": "git",
"url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "a26ed1827d63aef79bd9c12b172b33437e2d194d"
+ "reference": "bd11aff9c9fed495317e7a8b1134e917a2952031"
},
"require": {
"data-values/common": "~0.2.0",
@@ -1321,7 +1321,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2014-10-29 12:01:16",
+ "time": "2014-10-29 14:34:41",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/170036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I923bbfc264454e07d3cfe6c1817fcfd270f61eda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf6
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
