[MediaWiki-commits] [Gerrit] Make sure $revisionId is always set - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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

Change subject: Make sure $revisionId is always set
......................................................................

Make sure $revisionId is always set

Also extracts the revision id extracting code into own method

Change-Id: I35c37c31128d09cff321406643506253331799ba
---
M repo/includes/api/ResultBuilder.php
1 file changed, 12 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/85/257585/1

diff --git a/repo/includes/api/ResultBuilder.php 
b/repo/includes/api/ResultBuilder.php
index 8b6c026..b89388d 100644
--- a/repo/includes/api/ResultBuilder.php
+++ b/repo/includes/api/ResultBuilder.php
@@ -1098,15 +1098,9 @@
                $value = $status->getValue();
 
                if ( isset( $value['revision'] ) ) {
-                       $revision = $value['revision'];
+                       $revisionId = $this->getRevisionId( $value['revision'] 
);
 
-                       if ( $revision instanceof Revision ) {
-                               $revisionId = $revision->getId();
-                       } elseif ( $revision instanceof EntityRevision ) {
-                               $revisionId = $revision->getRevisionId();
-                       }
-
-                       $this->setValue( $path, 'lastrevid', empty( $revisionId 
) ? 0 : $revisionId );
+                       $this->setValue( $path, 'lastrevid', $revisionId );
 
                        if ( $oldRevId && $oldRevId === $revisionId ) {
                                // like core's ApiEditPage
@@ -1115,4 +1109,14 @@
                }
        }
 
+       private function getRevisionId( $revision ) {
+               if ( $revision instanceof Revision ) {
+                       $revisionId = $revision->getId();
+               } elseif ( $revision instanceof EntityRevision ) {
+                       $revisionId = $revision->getRevisionId();
+               }
+
+               return empty( $revisionId ) ? 0 : $revisionId;
+       }
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35c37c31128d09cff321406643506253331799ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>

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