diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
| commit | 63601400e476c6cf43d985f3e7b9864681695ed4 (patch) | |
| tree | f7846203a952e38aaf66989d0a4702779f549962 /includes/api/ApiFeedContributions.php | |
| parent | 8ff01378c9e0207f9169b81966a51def645b6a51 (diff) | |
Update to MediaWiki 1.20.2
this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'includes/api/ApiFeedContributions.php')
| -rw-r--r-- | includes/api/ApiFeedContributions.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/includes/api/ApiFeedContributions.php b/includes/api/ApiFeedContributions.php index 4e70bde2..1cf760ae 100644 --- a/includes/api/ApiFeedContributions.php +++ b/includes/api/ApiFeedContributions.php @@ -60,7 +60,7 @@ class ApiFeedContributions extends ApiBase { $this->dieUsage( 'Size difference is disabled in Miser Mode', 'sizediffdisabled' ); } - $msg = wfMsgForContent( 'Contributions' ); + $msg = wfMessage( 'Contributions' )->inContentLanguage()->text(); $feedTitle = $wgSitename . ' - ' . $msg . ' [' . $wgLanguageCode . ']'; $feedUrl = SpecialPage::getTitleFor( 'Contributions', $params['user'] )->getFullURL(); @@ -96,7 +96,7 @@ class ApiFeedContributions extends ApiBase { } protected function feedItem( $row ) { - $title = Title::MakeTitle( intval( $row->page_namespace ), $row->page_title ); + $title = Title::makeTitle( intval( $row->page_namespace ), $row->page_title ); if( $title ) { $date = $row->rev_timestamp; $comments = $title->getTalkPage()->getFullURL(); @@ -129,7 +129,8 @@ class ApiFeedContributions extends ApiBase { */ protected function feedItemDesc( $revision ) { if( $revision ) { - return '<p>' . htmlspecialchars( $revision->getUserText() ) . wfMsgForContent( 'colon-separator' ) . + $msg = wfMessage( 'colon-separator' )->inContentLanguage()->text(); + return '<p>' . htmlspecialchars( $revision->getUserText() ) . $msg . htmlspecialchars( FeedItem::stripComment( $revision->getComment() ) ) . "</p>\n<hr />\n<div>" . nl2br( htmlspecialchars( $revision->getText() ) ) . "</div>"; @@ -150,8 +151,7 @@ class ApiFeedContributions extends ApiBase { ApiBase::PARAM_REQUIRED => true, ), 'namespace' => array( - ApiBase::PARAM_TYPE => 'namespace', - ApiBase::PARAM_ISMULTI => true + ApiBase::PARAM_TYPE => 'namespace' ), 'year' => array( ApiBase::PARAM_TYPE => 'integer' |