jenkins-bot has submitted this change and it was merged.

Change subject: Also unset page property in PageImagesDataUpdate
......................................................................


Also unset page property in PageImagesDataUpdate

Not absolutely necesarry, but I feel better having this.

Change-Id: Ie7a6d56062e3a3c77b55f3e6911e1bf68cdce961
---
M repo/includes/ParserOutput/GeoDataDataUpdate.php
M repo/includes/ParserOutput/PageImagesDataUpdate.php
2 files changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/repo/includes/ParserOutput/GeoDataDataUpdate.php 
b/repo/includes/ParserOutput/GeoDataDataUpdate.php
index d484f83..798af83 100644
--- a/repo/includes/ParserOutput/GeoDataDataUpdate.php
+++ b/repo/includes/ParserOutput/GeoDataDataUpdate.php
@@ -55,6 +55,7 @@
         * @param PropertyDataTypeMatcher $propertyDataTypeMatcher
         * @param string[] $preferredPropertiesIds
         * @param string[] $globeUris
+        *
         * @throws RuntimeException
         */
        public function __construct(
@@ -163,7 +164,7 @@
 
        /**
         * @param CoordinatesOutput $coordinatesOutput
-        * @param string $key
+        * @param string $primaryCoordKey
         */
        private function addPrimaryCoordinate(
                CoordinatesOutput $coordinatesOutput,
diff --git a/repo/includes/ParserOutput/PageImagesDataUpdate.php 
b/repo/includes/ParserOutput/PageImagesDataUpdate.php
index 14782cd..3591102 100644
--- a/repo/includes/ParserOutput/PageImagesDataUpdate.php
+++ b/repo/includes/ParserOutput/PageImagesDataUpdate.php
@@ -177,9 +177,13 @@
         * @param ParserOutput $parserOutput
         */
        public function updateParserOutput( ParserOutput $parserOutput ) {
-               if ( $this->bestFileName !== null ) {
-                       // This property name is the only "soft dependency" on 
the PageImages extension.
-                       $parserOutput->setProperty( 'page_image', 
$this->bestFileName );
+               // This page property's name is the only "soft dependency" on 
the PageImages extension.
+               $propertyName = 'page_image';
+
+               if ( $this->bestFileName === null ) {
+                       $parserOutput->unsetProperty( $propertyName );
+               } else {
+                       $parserOutput->setProperty( $propertyName, 
$this->bestFileName );
                }
        }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/249759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7a6d56062e3a3c77b55f3e6911e1bf68cdce961
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to