Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/286434
Change subject: Update Wikidata - fix for rdf dumps
......................................................................
Update Wikidata - fix for rdf dumps
Change-Id: I03083272b522ea4be1e45a844e5e0d7f14b243eb
---
M composer.lock
M extensions/Wikibase/purtle/src/RdfWriterBase.php
M vendor/composer/installed.json
3 files changed, 18 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/34/286434/1
diff --git a/composer.lock b/composer.lock
index aceef61..a3e438f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -784,7 +784,7 @@
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/4869d99174723bbb326873594479d1ea48ac5e90";,
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/a1db2b1e1b9d7a2a4aa29e4192af4c4236993515";,
"reference": "54069df2ebd59f8fbac4119b3ebc894540eda056",
"shasum": ""
},
@@ -1446,12 +1446,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "4e341b6d267b2dd687c40bb7696830329dd08393"
+ "reference": "5f7f9ca8882d938f6b741b3d7cc9d088307cc2f1"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/4e341b6d267b2dd687c40bb7696830329dd08393";,
- "reference": "4e341b6d267b2dd687c40bb7696830329dd08393",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5f7f9ca8882d938f6b741b3d7cc9d088307cc2f1";,
+ "reference": "5f7f9ca8882d938f6b741b3d7cc9d088307cc2f1",
"shasum": ""
},
"require": {
@@ -1523,7 +1523,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-04-29 16:56:50"
+ "time": "2016-04-30 00:50:25"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/purtle/src/RdfWriterBase.php
b/extensions/Wikibase/purtle/src/RdfWriterBase.php
index 8e87ef2..6d0876d 100644
--- a/extensions/Wikibase/purtle/src/RdfWriterBase.php
+++ b/extensions/Wikibase/purtle/src/RdfWriterBase.php
@@ -351,7 +351,10 @@
final public function about( $base, $local = null ) {
$this->expandSubject( $base, $local );
- if ( $base === $this->currentSubject[0] && $local ===
$this->currentSubject[1] ) {
+ if ( $this->state === self::STATE_OBJECT
+ && $base === $this->currentSubject[0]
+ && $local === $this->currentSubject[1]
+ ) {
return $this; // redundant about() call
}
@@ -392,7 +395,10 @@
final public function say( $base, $local = null ) {
$this->expandPredicate( $base, $local );
- if ( $base === $this->currentPredicate[0] && $local ===
$this->currentPredicate[1] ) {
+ if ( $this->state === self::STATE_OBJECT
+ && $base === $this->currentPredicate[0]
+ && $local === $this->currentPredicate[1]
+ ) {
return $this; // redundant about() call
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a300491..499945e 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1505,7 +1505,7 @@
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/4869d99174723bbb326873594479d1ea48ac5e90";,
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/a1db2b1e1b9d7a2a4aa29e4192af4c4236993515";,
"reference": "54069df2ebd59f8fbac4119b3ebc894540eda056",
"shasum": ""
},
@@ -1535,12 +1535,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "4e341b6d267b2dd687c40bb7696830329dd08393"
+ "reference": "5f7f9ca8882d938f6b741b3d7cc9d088307cc2f1"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/4e341b6d267b2dd687c40bb7696830329dd08393";,
- "reference": "4e341b6d267b2dd687c40bb7696830329dd08393",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5f7f9ca8882d938f6b741b3d7cc9d088307cc2f1";,
+ "reference": "5f7f9ca8882d938f6b741b3d7cc9d088307cc2f1",
"shasum": ""
},
"require": {
@@ -1572,7 +1572,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-04-29 16:56:50",
+ "time": "2016-04-30 00:50:25",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/286434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03083272b522ea4be1e45a844e5e0d7f14b243eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.27.0-wmf.22
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
