Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199270
Change subject: Update Wikidata
......................................................................
Update Wikidata
* bug fixes to dispatch changes script
* switch order of description and alias in header (back to
how it is currently on Wikidata)
* Fix css on Special:NewItem and Special:NewProperty
* Fix rendering of qualifiers on save
* Security fix for MergeItems api module
Change-Id: Ied92e1f088c5287409e05bec26a2aef40d44358a
---
M composer.lock
M extensions/Wikibase/lib/maintenance/dispatchChanges.php
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M extensions/Wikibase/repo/includes/View/EntityTermsView.php
M extensions/Wikibase/repo/includes/api/MergeItems.php
M extensions/Wikibase/repo/resources/templates.php
M extensions/Wikibase/repo/resources/wikibase.special/wikibase.special.css
M vendor/composer/installed.json
11 files changed, 39 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/70/199270/1
diff --git a/composer.lock b/composer.lock
index 1ed7281..1d8c9bb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1237,12 +1237,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "c5f4cd35a8ff2c7e95157fbb354909964e5a1391"
+ "reference": "75b3a2284f1780663c54655957db2992d774d7dd"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c5f4cd35a8ff2c7e95157fbb354909964e5a1391";,
- "reference": "c5f4cd35a8ff2c7e95157fbb354909964e5a1391",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/75b3a2284f1780663c54655957db2992d774d7dd";,
+ "reference": "75b3a2284f1780663c54655957db2992d774d7dd",
"shasum": ""
},
"require": {
@@ -1309,7 +1309,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-03-18 14:23:48"
+ "time": "2015-03-24 14:53:33"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/lib/maintenance/dispatchChanges.php
b/extensions/Wikibase/lib/maintenance/dispatchChanges.php
index f2131d8..8b99b38 100644
--- a/extensions/Wikibase/lib/maintenance/dispatchChanges.php
+++ b/extensions/Wikibase/lib/maintenance/dispatchChanges.php
@@ -418,9 +418,9 @@
,
__METHOD__,
array(
- 'ORDER BY chd_seen ASC',
+ 'ORDER BY' => 'chd_seen ASC',
'FOR UPDATE',
- 'LIMIT ' . (int)$this->randomness
+ 'LIMIT' => (int)$this->randomness
)
);
@@ -860,7 +860,7 @@
// The change is relevant if it alters any
sitelinks referring to $siteID,
// or the item currently links to $siteID.
if ( isset( $linkedItems[$itemId] )
- || $this->isRelevantChange( $change,
$siteID ) !== null ) {
+ || $this->isRelevantChange( $change,
$siteID ) ) {
$filteredChanges[] = $change;
$numberOfChangesFound++;
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
index 1cf2d1d..02f2e69 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
@@ -52,8 +52,8 @@
templateParams: [
mw.msg(
'wikibase-entitytermsforlanguagelistview-language' ),
mw.msg( 'wikibase-entitytermsforlanguagelistview-label'
),
- mw.msg(
'wikibase-entitytermsforlanguagelistview-aliases' ),
mw.msg(
'wikibase-entitytermsforlanguagelistview-description' ),
+ mw.msg(
'wikibase-entitytermsforlanguagelistview-aliases' ),
'' // entitytermsforlanguageview
],
templateShortCuts: {
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
index 8f36f77..ffca465 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
@@ -67,8 +67,8 @@
);
},
'', // label
- '', // aliases
'', // description
+ '', // aliases
'' // toolbar placeholder
],
templateShortCuts: {
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
index a6296c4..a26d60c 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
@@ -55,10 +55,10 @@
templateParams: [
'', // label class
'', // labelview
- '', // aliases class
- '', // aliasesview
'', // description class
'', // descriptionview
+ '', // aliases class
+ '', // aliasesview
'', // entitytermsforlanguagelistview
'', // additional entitytermsforlanguagelistview
container class(es)
'' // toolbar placeholder
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index bcb6c72..72f1435 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -478,7 +478,11 @@
: this.option( 'predefined' ).mainSnak || null
);
- if( this.isInEditMode() ) {
+ if( this.isInEditMode()
+ || this.options.value
+ &&
this.options.value.getClaim().getQualifiers().length
+ && !this.$qualifiers.children().length
+ ) {
this._createQualifiersListview(
this.options.value
?
this.options.value.getClaim().getQualifiers()
diff --git a/extensions/Wikibase/repo/includes/View/EntityTermsView.php
b/extensions/Wikibase/repo/includes/View/EntityTermsView.php
index d1f06d7..88ee5bb 100644
--- a/extensions/Wikibase/repo/includes/View/EntityTermsView.php
+++ b/extensions/Wikibase/repo/includes/View/EntityTermsView.php
@@ -83,10 +83,10 @@
return $this->templateFactory->render(
'wikibase-entitytermsview',
$labels->hasTermForLanguage( $this->languageCode ) ? ''
: 'wb-empty',
$this->getHtmlForLabel( $labels, $entityId ),
- $aliasGroups->hasGroupForLanguage( $this->languageCode
) ? '' : 'wb-empty',
- $this->getHtmlForAliases( $aliasGroups ),
$descriptions->hasTermForLanguage( $this->languageCode
) ? '' : 'wb-empty',
$this->getDescriptionText( $descriptions ),
+ $aliasGroups->hasGroupForLanguage( $this->languageCode
) ? '' : 'wb-empty',
+ $this->getHtmlForAliases( $aliasGroups ),
$termBoxHtml,
$textInjector->newMarker(
'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class'
@@ -182,8 +182,8 @@
return $this->templateFactory->render(
'wikibase-entitytermsforlanguagelistview',
$this->msg(
'wikibase-entitytermsforlanguagelistview-language' ),
$this->msg(
'wikibase-entitytermsforlanguagelistview-label' ),
- $this->msg(
'wikibase-entitytermsforlanguagelistview-aliases' ),
$this->msg(
'wikibase-entitytermsforlanguagelistview-description' ),
+ $this->msg(
'wikibase-entitytermsforlanguagelistview-aliases' ),
$entityTermsForLanguageViewsHtml
);
}
@@ -226,7 +226,6 @@
'',
''
),
- $this->getAliasesView( $aliasGroups, $languageCode ),
$this->templateFactory->render(
'wikibase-descriptionview',
$hasDescription ? '' : 'wb-empty',
htmlspecialchars( $hasDescription
@@ -236,6 +235,7 @@
'',
''
),
+ $this->getAliasesView( $aliasGroups, $languageCode ),
''
);
}
diff --git a/extensions/Wikibase/repo/includes/api/MergeItems.php
b/extensions/Wikibase/repo/includes/api/MergeItems.php
index 38ad1e4..adaf84e 100644
--- a/extensions/Wikibase/repo/includes/api/MergeItems.php
+++ b/extensions/Wikibase/repo/includes/api/MergeItems.php
@@ -176,6 +176,15 @@
}
/**
+ * @see ApiBase::needsToken
+ *
+ * @return string
+ */
+ public function needsToken() {
+ return 'csrf';
+ }
+
+ /**
* @see ApiBase::getAllowedParams
*/
protected function getAllowedParams() {
@@ -194,7 +203,6 @@
'summary' => array(
ApiBase::PARAM_TYPE => 'string',
),
- 'token' => null,
'bot' => false
);
}
diff --git a/extensions/Wikibase/repo/resources/templates.php
b/extensions/Wikibase/repo/resources/templates.php
index 55c7835..0c6263c 100644
--- a/extensions/Wikibase/repo/resources/templates.php
+++ b/extensions/Wikibase/repo/resources/templates.php
@@ -158,8 +158,8 @@
<div class="wikibase-entitytermsview">
<div class="wikibase-entitytermsview-heading">
<h1 class="wikibase-entitytermsview-heading-label $1"><!--
wikibase-entitytermsview-label -->$2</h1>
- <div class="wikibase-entitytermsview-heading-aliases $3"><!--
wikibase-entitytermsview-aliases -->$4</div>
- <div class="wikibase-entitytermsview-heading-description
$5">$6</div>
+ <div class="wikibase-entitytermsview-heading-description
$3">$4</div>
+ <div class="wikibase-entitytermsview-heading-aliases $5"><!--
wikibase-entitytermsview-aliases -->$6</div>
</div>
<!-- ? wikibase-toolbar -->$9
<div class="wikibase-entitytermsview-entitytermsforlanguagelistview
$8"><!-- wikibase-entitytermsforlanguagelistview -->$7</div>
@@ -188,8 +188,8 @@
<tr class="wikibase-entitytermsforlanguagelistview-header-row">
<td class="wikibase-entitytermsforlanguagelistview-cell
wikibase-entitytermsforlanguagelistview-language">$1</td>
<td class="wikibase-entitytermsforlanguagelistview-cell
wikibase-entitytermsforlanguagelistview-label">$2</td>
- <td class="wikibase-entitytermsforlanguagelistview-cell
wikibase-entitytermsforlanguagelistview-aliases">$3</td>
- <td class="wikibase-entitytermsforlanguagelistview-cell
wikibase-entitytermsforlanguagelistview-description">$4</td>
+ <td class="wikibase-entitytermsforlanguagelistview-cell
wikibase-entitytermsforlanguagelistview-description">$3</td>
+ <td class="wikibase-entitytermsforlanguagelistview-cell
wikibase-entitytermsforlanguagelistview-aliases">$4</td>
</tr>
</thead>
<tbody class="wikibase-entitytermsforlanguagelistview-listview"><!--
[0,*] wikibase-entitytermsforlanguageview -->$5</tbody>
@@ -201,8 +201,8 @@
<$1 class="wikibase-entitytermsforlanguageview
wikibase-entitytermsforlanguageview-$3" >
<$2 class="wikibase-entitytermsforlanguageview-language"><!--
wikibase-entitytermsforlanguageview-language -->$4</$2>
<$2 class="wikibase-entitytermsforlanguageview-label">$5</$2>
- <$2 class="wikibase-entitytermsforlanguageview-aliases">$6</$2>
- <$2 class="wikibase-entitytermsforlanguageview-description">$7</$2>
+ <$2 class="wikibase-entitytermsforlanguageview-description">$6</$2>
+ <$2 class="wikibase-entitytermsforlanguageview-aliases">$7</$2>
<!-- ? wikibase-toolbar -->$8
</$1>
HTML;
diff --git
a/extensions/Wikibase/repo/resources/wikibase.special/wikibase.special.css
b/extensions/Wikibase/repo/resources/wikibase.special/wikibase.special.css
index f5c9e68..cb37733 100644
--- a/extensions/Wikibase/repo/resources/wikibase.special/wikibase.special.css
+++ b/extensions/Wikibase/repo/resources/wikibase.special/wikibase.special.css
@@ -9,10 +9,6 @@
/********** Create item/property page **********/
-.wb-fieldset {
- float: left;
-}
-
.wb-label, .wb-input, .wb-button, .wb-select {
display: block;
float: left;
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 7f71d89..c5640fd 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1329,12 +1329,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "c5f4cd35a8ff2c7e95157fbb354909964e5a1391"
+ "reference": "75b3a2284f1780663c54655957db2992d774d7dd"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c5f4cd35a8ff2c7e95157fbb354909964e5a1391";,
- "reference": "c5f4cd35a8ff2c7e95157fbb354909964e5a1391",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/75b3a2284f1780663c54655957db2992d774d7dd";,
+ "reference": "75b3a2284f1780663c54655957db2992d774d7dd",
"shasum": ""
},
"require": {
@@ -1362,7 +1362,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2015-03-18 14:23:48",
+ "time": "2015-03-24 14:53:33",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/199270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied92e1f088c5287409e05bec26a2aef40d44358a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf22
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
