Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357802 )
Change subject: Handle possible null $oldRev in DiffViewHeader hook handler
......................................................................
Handle possible null $oldRev in DiffViewHeader hook handler
Sometimes $oldRev can be null (e.g. not a Revision, but
maybe is a missing revision), and also not sure we can be
certain about $newRev being a Revision object.
Bug: T167359
Change-Id: I4c483d711f2ec07a918c708a473aff1b2c150cf5
(cherry picked from commit 71c586a351b0f79797f14bb07d18146e02681244)
---
M src/RevisionSliderHooks.php
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/02/357802/1
diff --git a/src/RevisionSliderHooks.php b/src/RevisionSliderHooks.php
index 93dc1cb..c89b0ec 100644
--- a/src/RevisionSliderHooks.php
+++ b/src/RevisionSliderHooks.php
@@ -29,11 +29,12 @@
return self::$config;
}
- public static function onDiffViewHeader(
- DifferenceEngine $diff,
- Revision $oldRev,
- Revision $newRev
- ) {
+ public static function onDiffViewHeader( DifferenceEngine $diff,
Revision $oldRev, $newRev ) {
+ // sometimes $oldRev can be null (e.g. missing rev), and
perhaps also $newRev (T167359)
+ if ( !( $oldRev instanceof Revision ) || !( $newRev instanceof
Revision ) ) {
+ return true;
+ }
+
$config = self::getConfig();
/**
--
To view, visit https://gerrit.wikimedia.org/r/357802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c483d711f2ec07a918c708a473aff1b2c150cf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: wmf/1.30.0-wmf.4
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
