* Cleanup for r37375. Split duplicated code into function and really fix it

[lhc/web/wiklou.git] / includes / LogPage.php

diff --git a/includes/LogPage.php b/includes/LogPage.php
index 977c74f..2755430 100644 (file)
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -193,6 +193,11 @@ class LogPage {
                                if( $key == 'rights/rights' ) {
                                        if ($skin) {
                                                $rightsnone = wfMsg( 'rightsnone' );
+                                               foreach ( $params as &$param ) {
+                                                       $groupArray = array_map( 'trim', explode( ',', $param ) );
+                                                       $groupArray = array_map( array( 'User', 'getGroupName' ), $groupArray );
+                                                       $param = $wgLang->listToText( $groupArray );
+                                               }
                                        } else {
                                                $rightsnone = wfMsgForContent( 'rightsnone' );
                                        }
@@ -259,7 +264,7 @@ class LogPage {
                
                if ($doer === null) {
                        global $wgUser;
-                       $doer = $wgUser->getId();
+                       $doer = $wgUser;
                } elseif (!is_object( $doer ) ) {
                        $doer = User::newFromId( $doer );
                }