Fix for bug 5592

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3748654..7916fcd 100644 (file)
--- 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 ff1c805..6b7d2ff 100644 (file)
--- 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 {