From ad8e5c9ccecfe66c9cc5d93f460e53c29584b0a2 Mon Sep 17 00:00:00 2001 From: Anders Wegge Jakobsen Date: Tue, 18 Apr 2006 18:05:13 +0000 Subject: [PATCH] Fix for bug 5592 --- RELEASE-NOTES | 2 ++ includes/LogPage.php | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 37486547da..7916fcd1da 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -99,6 +99,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN edits up to a certain edit, and not just the latest edit.. * Made MessageRo.php more general * (bug 5640) Indonesian localisation improvements +* (bug 5592) Actions are logged with the default language for the + wiki, not the language of the user performing the operation. == Compatibility == diff --git a/includes/LogPage.php b/includes/LogPage.php index ff1c805eb8..6b7d2ffde0 100644 --- a/includes/LogPage.php +++ b/includes/LogPage.php @@ -206,13 +206,17 @@ class LogPage { $titleLink = $title->getPrefixedText(); } if( count( $params ) == 0 ) { - $rv = wfMsg( $actions[$key], $titleLink ); + if ( $skin ) { + $rv = wfMsg( $actions[$key], $titleLink ); + } else { + $rv = wfMsgForContent( $actions[$key], $titleLink ); + } } else { array_unshift( $params, $titleLink ); if ( $translate && $key == 'block/block' ) { $params[1] = $wgLang->translateBlockExpiry($params[1]); } - $rv = wfMsgReal( $actions[$key], $params, true, false ); // FIXME: use wfMsgForContent() ? + $rv = wfMsgReal( $actions[$key], $params, true, !$skin ); } } } else { -- 2.20.1