jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352741 )
Change subject: Temporarily disable use of client services in WikibaseRepo
......................................................................
Temporarily disable use of client services in WikibaseRepo
Re-applying I993298d7a1527eb320ca920ad09560004ab8c3f0 on
the deployment branch, until we have a solution in
master for T158847.
Change-Id: Ia8ea1d6d5403e14d59eaa89c5f6738d01feb5825
(cherry picked from commit 2755a3431f5a763b634c2c46d034ad34796631e0)
(cherry picked from commit fea0916063ddf80f32db45caf94ae9d742abdeaf)
(cherry picked from commit 5f502023e8b41e67488bef859f38a945a2807496)
---
M repo/includes/WikibaseRepo.php
1 file changed, 0 insertions(+), 7 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index d25e4d5..e13aab5 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -32,7 +32,6 @@
use ValueFormatters\ValueFormatter;
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
use Wikibase\Client\EntityDataRetrievalServiceFactory;
-use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\DeserializerFactory;
use Wikibase\DataModel\Entity\DispatchingEntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParser;
@@ -327,12 +326,6 @@
$repositoryDefinitions =
self::getRepositoryDefinitionsFromSettings( $settings );
$dataRetrievalServices = null;
-
- // If client functionality is enabled, use it to enable
federation.
- if ( defined( 'WBC_VERSION' ) ) {
- $dataRetrievalServices =
WikibaseClient::getDefaultInstance()->getEntityDataRetrievalServiceFactory();
- $repositoryDefinitions =
WikibaseClient::getDefaultInstance()->getRepositoryDefinitions();
- }
return new self(
$settings,
--
To view, visit https://gerrit.wikimedia.org/r/352741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8ea1d6d5403e14d59eaa89c5f6738d01feb5825
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
