wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-09-24 10:49:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "$language->prettyTimestamp is expecting 3 arguments"

Browse source
This commit is contained in:
Alex Monk 2012-10-26 22:29:30 +00:00 committed by Gerrit Code Review
parent 690b6a4157 86c3b094d8
commit b03846e86f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/ApiEchoNotifications.php
View file

@ -72,7 +72,7 @@ class ApiEchoNotifications extends ApiQueryBase {
$event = EchoEvent::newFromRow( $row );
if ( MWInit::methodExists( 'Language', 'prettyTimestamp' ) ) {
$ts = $this->getLanguage()->prettyTimestamp( $event->getTimestamp() );
$ts = $this->getLanguage()->prettyTimestamp( $event->getTimestamp(), false, $user );
} else {
$ts = $this->getLanguage()->timeanddate( $event->getTimestamp(), true );
}

2
formatters/NotificationFormatter.php
View file

@ -119,7 +119,7 @@ abstract class EchoNotificationFormatter {
$language = Language::factory( $languageCode );
if ( MWInit::methodExists( 'Language', 'prettyTimestamp' ) ) {
$ts = $language->prettyTimestamp( $ts );
$ts = $language->prettyTimestamp( $ts, false, $user );
} else {
$ts = $language->userTimeAndDate( $ts, $user );
}