Adamw has submitted this change and it was merged. Change subject: Fix Warnings on Campaign Logger ......................................................................
Fix Warnings on Campaign Logger for some reason privates are not actually private. Originally this threw warnings for the campaign logger; when https://gerrit.wikimedia.org/r/#/c/93156/1 this was tried things broke in the banner logger... so we rename Change-Id: I0ae5d1c8be45f4633d5a87adeafdcf0e7af4adff --- M CentralNoticeBannerLogPager.php M CentralNoticeCampaignLogPager.php 2 files changed, 5 insertions(+), 6 deletions(-) Approvals: Adamw: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/CentralNoticeBannerLogPager.php b/CentralNoticeBannerLogPager.php index 07a1460..5b6e1b5 100644 --- a/CentralNoticeBannerLogPager.php +++ b/CentralNoticeBannerLogPager.php @@ -187,10 +187,10 @@ ); } - $details = $this->testBooleanChange( 'anon', $newrow, $oldrow ); - $details .= $this->testBooleanChange( 'account', $newrow, $oldrow ); + $details = $this->testBooleanChange2( 'anon', $newrow, $oldrow ); + $details .= $this->testBooleanChange2( 'account', $newrow, $oldrow ); $details .= $this->testTextChange( 'category', $newrow, $oldrow ); - $details .= $this->testBooleanChange( 'autolink', $newrow, $oldrow ); + $details .= $this->testBooleanChange2( 'autolink', $newrow, $oldrow ); $details .= $this->testTextChange( 'landingpages', $newrow, $oldrow ); $details .= $this->testTextChange( 'controller_mixin', $newrow, $oldrow ); $details .= $this->testTextChange( 'prioritylangs', $newrow, $oldrow ); @@ -206,7 +206,7 @@ return $details; } - private function testBooleanChange( $param, $newrow, $oldrow ) { + private function testBooleanChange2( $param, $newrow, $oldrow ) { $result = ''; $endField = 'tmplog_end_'.$param; diff --git a/CentralNoticeCampaignLogPager.php b/CentralNoticeCampaignLogPager.php index 0744633..166d1a0 100644 --- a/CentralNoticeCampaignLogPager.php +++ b/CentralNoticeCampaignLogPager.php @@ -303,10 +303,9 @@ /** * @param $param * @param $row - * @param array $oldrow Required because this is a stupid heirarchy -- @see CentralNoticeBannerLogPager * @return string */ - private function testBooleanChange( $param, $row, $oldrow ) { + private function testBooleanChange( $param, $row ) { $result = ''; $beginField = 'notlog_begin_' . $param; $endField = 'notlog_end_' . $param; -- To view, visit https://gerrit.wikimedia.org/r/93602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ae5d1c8be45f4633d5a87adeafdcf0e7af4adff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Mwalker <[email protected]> Gerrit-Reviewer: Adamw <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
