From 9ec6c4967e6d4164e50d78970bf8f4d540386a48 Mon Sep 17 00:00:00 2001 From: aude Date: Sat, 6 Sep 2014 18:40:52 +0200 Subject: [PATCH] Fix undefined argument in OldChangesList Bug: 70407 Change-Id: I17bbaeaf7c9cae51e33c859867ef3a3199b68a43 --- includes/changes/OldChangesList.php | 5 +++-- tests/phpunit/includes/changes/OldChangesListTest.php | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/includes/changes/OldChangesList.php b/includes/changes/OldChangesList.php index b779a029c1..4eed9262a8 100644 --- a/includes/changes/OldChangesList.php +++ b/includes/changes/OldChangesList.php @@ -49,7 +49,7 @@ class OldChangesList extends ChangesList { $classes[] = $watched && $rc->mAttribs['rc_timestamp'] >= $watched ? 'mw-changeslist-line-watched' : 'mw-changeslist-line-not-watched'; - $html = $this->formatChangeLine( $rc, $watched ); + $html = $this->formatChangeLine( $rc, $classes, $watched ); if ( $this->watchlist ) { $classes[] = Sanitizer::escapeClass( 'watchlist-' . @@ -72,11 +72,12 @@ class OldChangesList extends ChangesList { /** * @param RecentChange $rc + * @param string[] &$classes * @param boolean $watched * * @return string */ - private function formatChangeLine( RecentChange $rc, $watched ) { + private function formatChangeLine( RecentChange $rc, array &$classes, $watched ) { $html = ''; if ( $rc->mAttribs['rc_log_type'] ) { diff --git a/tests/phpunit/includes/changes/OldChangesListTest.php b/tests/phpunit/includes/changes/OldChangesListTest.php index d009192b02..3a36b9f302 100644 --- a/tests/phpunit/includes/changes/OldChangesListTest.php +++ b/tests/phpunit/includes/changes/OldChangesListTest.php @@ -123,6 +123,17 @@ class OldChangesListTest extends MediaWikiLangTestCase { ); } + public function testRecentChangesLine_Tags() { + $recentChange = $this->getEditChange(); + $recentChange->mAttribs['ts_tags'] = 'vandalism,newbie'; + + $oldChangesList = $this->getOldChangesList(); + $line = $oldChangesList->recentChangesLine( $recentChange, false, 1 ); + + $this->assertRegExp( '/
  • /', $line ); + $this->assertRegExp( '/
  • /', $line ); + } + private function getNewBotEditChange() { $user = $this->getTestUser(); -- 2.20.1