[MediaWiki-commits] [Gerrit] Update Wikidata - change (mediawiki...Wikidata)

2015-03-30 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Update Wikidata
..


Update Wikidata

* Fix unstyled "edit links" in client on page preview
* Fix JS focus issues on Wikidata when adding statements and qualifiers
* Fixes for dispatch changes, after investigating and resolving
  the issues from last week.
* Added debugging in WikiPageEntityRevisionLookup

Change-Id: I80a5bb32f33b89c51618e29e0c10e60b9746f97f
---
M composer.lock
M extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh
M extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php
M extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
M extensions/Wikibase/lib/maintenance/dispatchChanges.php
M extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/controller/definitions/addtoolbar/statementview-snakview.js
M vendor/composer/installed.json
8 files changed, 63 insertions(+), 73 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.lock b/composer.lock
index a0e9c21..45219a8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1237,7 +1237,7 @@
 "source": {
 "type": "git",
 "url": 
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
-"reference": "c42291f422f391dd14388859caf39857e80a4959"
+"reference": "5b20f5bc1749a0e9446783cb87de283638053e98"
 },
 "require": {
 "data-values/common": "~0.2.0",
@@ -1306,7 +1306,7 @@
 "issues": "https://bugzilla.wikimedia.org/";,
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2015-03-25 14:50:27"
+"time": "2015-03-30 18:42:58"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh 
b/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh
index f840886..89fde06 100755
--- a/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh
+++ b/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh
@@ -55,7 +55,7 @@
   echo "define( 'WB_EXPERIMENTAL_FEATURES', $EXPERIMENTAL );" >> 
LocalSettings.php
 }
 
-cd $WORKSPACE
+cd $WORKSPACE/src
 
 echo '> LocalSettings.php
 
diff --git 
a/extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php 
b/extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php
index 12791dd..b3e0d44 100644
--- a/extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php
+++ b/extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php
@@ -68,7 +68,7 @@
private function hasEditOrAddLinks( OutputPage $out, Title $title, 
$actionName ) {
if (
$out->getProperty( 'noexternallanglinks' ) ||
-   $actionName !== 'view' ||
+   !in_array( $actionName, array( 'view', 'submit' ) ) ||
!$title->exists()
) {
return false;
diff --git 
a/extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php 
b/extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
index ffc5d94..26f6316 100644
--- 
a/extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
+++ 
b/extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
@@ -92,11 +92,13 @@
}
 
if ( $entityRevision !== null && 
!$entityRevision->getEntity()->getId()->equals( $entityId ) ) {
-   // This can happen when giving a revision ID that 
doesn't belong to the given entity
-   wfDebugLog( __CLASS__, __FUNCTION__ . ': Loaded wrong 
entity: Expected ' . $entityId
-   . ', got ' . 
$entityRevision->getEntity()->getId() );
+   // This can happen when giving a revision ID that 
doesn't belong to the given entity,
+   // or some meta data is incorrect.
+   $actualEntityId = 
$entityRevision->getEntity()->getId()->getSerialization();
 
-   throw new BadRevisionException( "Revision $revisionId 
does not belong to entity $entityId" );
+   // Get the revision id we actually loaded, if none was 
passed explicitly
+   $revisionId = is_int( $revisionId ) ? $revisionId : 
$entityRevision->getRevisionId();
+   throw new BadRevisionException( "Revision $revisionId 
belongs to $actualEntityId instead of expected $entityId" );
}
 
if ( is_int( $revisionId ) && $entityRevision === null ) {
diff --git a/extensions/Wikibase/lib/maintenance/dispatchChanges.php 
b/extensions/Wikibase/lib/maintenance/dispatch

[MediaWiki-commits] [Gerrit] Update Wikidata - change (mediawiki...Wikidata)

2015-03-30 Thread Aude (Code Review) 
Aude has uploaded a new change for review.

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

Change subject: Update Wikidata
..

Update Wikidata

* Fix unstyled "edit links" in client on page preview
* Fix JS focus issues on Wikidata when adding statements and qualifiers
* Fixes for dispatch changes, after investigating and resolving
  the issues from last week.
* Added debugging in WikiPageEntityRevisionLookup

Change-Id: I80a5bb32f33b89c51618e29e0c10e60b9746f97f
---
M composer.lock
M extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh
M extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php
M extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
M extensions/Wikibase/lib/maintenance/dispatchChanges.php
M extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/controller/definitions/addtoolbar/statementview-snakview.js
M vendor/composer/installed.json
8 files changed, 63 insertions(+), 73 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/56/200656/1

diff --git a/composer.lock b/composer.lock
index a0e9c21..45219a8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1237,7 +1237,7 @@
 "source": {
 "type": "git",
 "url": 
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
-"reference": "c42291f422f391dd14388859caf39857e80a4959"
+"reference": "5b20f5bc1749a0e9446783cb87de283638053e98"
 },
 "require": {
 "data-values/common": "~0.2.0",
@@ -1306,7 +1306,7 @@
 "issues": "https://bugzilla.wikimedia.org/";,
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2015-03-25 14:50:27"
+"time": "2015-03-30 18:42:58"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh 
b/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh
index f840886..89fde06 100755
--- a/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh
+++ b/extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh
@@ -55,7 +55,7 @@
   echo "define( 'WB_EXPERIMENTAL_FEATURES', $EXPERIMENTAL );" >> 
LocalSettings.php
 }
 
-cd $WORKSPACE
+cd $WORKSPACE/src
 
 echo '> LocalSettings.php
 
diff --git 
a/extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php 
b/extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php
index 12791dd..b3e0d44 100644
--- a/extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php
+++ b/extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php
@@ -68,7 +68,7 @@
private function hasEditOrAddLinks( OutputPage $out, Title $title, 
$actionName ) {
if (
$out->getProperty( 'noexternallanglinks' ) ||
-   $actionName !== 'view' ||
+   !in_array( $actionName, array( 'view', 'submit' ) ) ||
!$title->exists()
) {
return false;
diff --git 
a/extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php 
b/extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
index ffc5d94..26f6316 100644
--- 
a/extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
+++ 
b/extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
@@ -92,11 +92,13 @@
}
 
if ( $entityRevision !== null && 
!$entityRevision->getEntity()->getId()->equals( $entityId ) ) {
-   // This can happen when giving a revision ID that 
doesn't belong to the given entity
-   wfDebugLog( __CLASS__, __FUNCTION__ . ': Loaded wrong 
entity: Expected ' . $entityId
-   . ', got ' . 
$entityRevision->getEntity()->getId() );
+   // This can happen when giving a revision ID that 
doesn't belong to the given entity,
+   // or some meta data is incorrect.
+   $actualEntityId = 
$entityRevision->getEntity()->getId()->getSerialization();
 
-   throw new BadRevisionException( "Revision $revisionId 
does not belong to entity $entityId" );
+   // Get the revision id we actually loaded, if none was 
passed explicitly
+   $revisionId = is_int( $revisionId ) ? $revisionId : 
$entityRevision->getRevisionId();
+   throw new BadRevisionException( "Revision $revisionId 
belongs to $actualEntityId instead of expected $entityId" );
}
 
if ( is_int( $revisionId ) && $entityRevision === null ) {
diff --git a/extensions/Wikibase/lib/maintenance/dispatchChan

[MediaWiki-commits] [Gerrit] Update Wikidata - change (mediawiki...Wikidata)

2015-03-24 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

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(-)

Approvals:
  Aude: Looks good to me, approved
  jenkins-bot: Verified



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
],

[MediaWiki-commits] [Gerrit] Update Wikidata - change (mediawiki...Wikidata)

2015-03-24 Thread Aude (Code Review) 
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' ),
'' /