[MediaWiki-commits] [Gerrit] Log a warning if ItemChange::getSiteLinkDiff returns a non-a... - change (mediawiki...Wikibase)

2013-07-13 Thread Hoo man (Code Review) 
Hoo man has uploaded a new change for review.

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


Change subject: Log a warning if ItemChange::getSiteLinkDiff returns a non-array
..

Log a warning if ItemChange::getSiteLinkDiff returns a non-array

Untested quick and dirty fix

Change-Id: Idfab159d2077bd3c85dd4eee99e1b7bb11e1a4e2
---
M lib/maintenance/dispatchChanges.php
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/lib/maintenance/dispatchChanges.php 
b/lib/maintenance/dispatchChanges.php
index 2573d63..5ce791a 100644
--- a/lib/maintenance/dispatchChanges.php
+++ b/lib/maintenance/dispatchChanges.php
@@ -855,7 +855,13 @@
if ( $change instanceof ItemChange  !$change-isEmpty() ) {
$siteLinkDiff = $change-getSiteLinkDiff();
 
-   if ( is_array( $siteLinkDiff )  isset( $siteLinkDiff[ 
$siteID ] ) ) {
+   if ( !is_array( $siteLinkDiff ) ) {
+   wfLogWarning( '$siteLinkDiff must be an array, 
' . gettype( $siteLinkDiff ) . ' given' );
+   wfProfileOut( __METHOD__ );
+   return false;
+   }
+
+   if ( isset( $siteLinkDiff[ $siteID ] ) ) {
wfProfileOut( __METHOD__ );
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfab159d2077bd3c85dd4eee99e1b7bb11e1a4e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de

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

[MediaWiki-commits] [Gerrit] Log a warning if ItemChange::getSiteLinkDiff returns a non-a... - change (mediawiki...Wikibase)

2013-07-13 Thread Denny Vrandecic (Code Review) 
Denny Vrandecic has submitted this change and it was merged.

Change subject: Log a warning if ItemChange::getSiteLinkDiff returns a non-array
..


Log a warning if ItemChange::getSiteLinkDiff returns a non-array

Untested quick and dirty fix

Change-Id: Idfab159d2077bd3c85dd4eee99e1b7bb11e1a4e2
---
M lib/maintenance/dispatchChanges.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/lib/maintenance/dispatchChanges.php 
b/lib/maintenance/dispatchChanges.php
index 2573d63..5ce791a 100644
--- a/lib/maintenance/dispatchChanges.php
+++ b/lib/maintenance/dispatchChanges.php
@@ -855,7 +855,13 @@
if ( $change instanceof ItemChange  !$change-isEmpty() ) {
$siteLinkDiff = $change-getSiteLinkDiff();
 
-   if ( is_array( $siteLinkDiff )  isset( $siteLinkDiff[ 
$siteID ] ) ) {
+   if ( !is_array( $siteLinkDiff ) ) {
+   wfLogWarning( '$siteLinkDiff must be an array, 
' . gettype( $siteLinkDiff ) . ' given' );
+   wfProfileOut( __METHOD__ );
+   return false;
+   }
+
+   if ( isset( $siteLinkDiff[ $siteID ] ) ) {
wfProfileOut( __METHOD__ );
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idfab159d2077bd3c85dd4eee99e1b7bb11e1a4e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Denny Vrandecic denny.vrande...@wikimedia.de
Gerrit-Reviewer: jenkins-bot

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