jenkins-bot has submitted this change and it was merged. Change subject: Update Wikidata - fix dumpRdf script ......................................................................
Update Wikidata - fix dumpRdf script Change-Id: Ic7414dbf186283602451c7b3dd17d48bcb7ea9c8 --- M composer.lock M extensions/Wikibase/repo/maintenance/dumpRdf.php M vendor/composer/installed.json 3 files changed, 14 insertions(+), 11 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.lock b/composer.lock index cb7b81b..a2cdbf8 100644 --- a/composer.lock +++ b/composer.lock @@ -1208,12 +1208,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "f0d13ae48115f089307178a810d14e61853e4ee1" + "reference": "8f5482a72728b91793d32d534c120719f71727ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f0d13ae48115f089307178a810d14e61853e4ee1", - "reference": "f0d13ae48115f089307178a810d14e61853e4ee1", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8f5482a72728b91793d32d534c120719f71727ca", + "reference": "8f5482a72728b91793d32d534c120719f71727ca", "shasum": "" }, "require": { @@ -1281,7 +1281,7 @@ "wikibaserepo", "wikidata" ], - "time": "2015-04-06 09:10:03" + "time": "2015-04-06 20:29:05" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/repo/maintenance/dumpRdf.php b/extensions/Wikibase/repo/maintenance/dumpRdf.php index 6dde8d2..61f56c7 100644 --- a/extensions/Wikibase/repo/maintenance/dumpRdf.php +++ b/extensions/Wikibase/repo/maintenance/dumpRdf.php @@ -2,6 +2,7 @@ namespace Wikibase; +use Title; use Wikibase\Dumpers\DumpGenerator; use Wikibase\Dumpers\RdfDumpGenerator; @@ -22,11 +23,13 @@ * @return DumpGenerator */ protected function createDumper( $output ) { - return RdfDumpGenerator::createDumpGenerator( + $entityDataTitle = Title::makeTitle( NS_SPECIAL, 'EntityData' ); + + return RdfDumpGenerator::createDumpGenerator( $this->getOption( 'format', 'ttl' ), $output, - $GLOBALS['wgCanonicalServer']."/entity/", - $GLOBALS['wgCanonicalServer']."/Special:EntityData/", + $this->wikibaseRepo->getSettings()->getSetting( 'conceptBaseUri' ), + $entityDataTitle->getCanonicalURL() . '/', $this->wikibaseRepo->getSiteStore()->getSites(), $this->entityLookup, $this->revisionLookup, $this->wikibaseRepo->getPropertyDataTypeLookup() ); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 865766c..ffd5b86 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1296,12 +1296,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "f0d13ae48115f089307178a810d14e61853e4ee1" + "reference": "8f5482a72728b91793d32d534c120719f71727ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f0d13ae48115f089307178a810d14e61853e4ee1", - "reference": "f0d13ae48115f089307178a810d14e61853e4ee1", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8f5482a72728b91793d32d534c120719f71727ca", + "reference": "8f5482a72728b91793d32d534c120719f71727ca", "shasum": "" }, "require": { @@ -1328,7 +1328,7 @@ "conflict": { "mediawiki/mediawiki": "<1.23" }, - "time": "2015-04-06 09:10:03", + "time": "2015-04-06 20:29:05", "type": "mediawiki-extension", "installation-source": "dist", "autoload": { -- To view, visit https://gerrit.wikimedia.org/r/202398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7414dbf186283602451c7b3dd17d48bcb7ea9c8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits