Fixing bug in HTML diff when the word '0' is encountered. Thanks siebrand for reporting

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

diff --git a/includes/LogPage.php b/includes/LogPage.php
index fcc245a..647cc01 100644 (file)
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -35,7 +35,7 @@ class LogPage {
        const DELETED_USER = 4;
     const DELETED_RESTRICTED = 8;
        /* @access private */
-       var $type, $action, $comment, $params, $target;
+       var $type, $action, $comment, $params, $target, $doer;
        /* @acess public */
        var $updateRecentChanges;
 
@@ -56,7 +56,6 @@ class LogPage {
                $fname = 'LogPage::saveContent';
 
                $dbw = wfGetDB( DB_MASTER );
-               $uid = $wgUser->getId();
                $log_id = $dbw->nextSequenceValue( 'log_log_id_seq' );
 
                $this->timestamp = $now = wfTimestampNow();
@@ -65,7 +64,7 @@ class LogPage {
                        'log_type' => $this->type,
                        'log_action' => $this->action,
                        'log_timestamp' => $dbw->timestamp( $now ),
-                       'log_user' => $uid,
+                       'log_user' => $this->doer->getId(),
                        'log_namespace' => $this->target->getNamespace(),
                        'log_title' => $this->target->getDBkey(),
                        'log_comment' => $this->comment,
@@ -83,7 +82,7 @@ class LogPage {
                        if( !isset($wgLogRestrictions[$this->type]) || $wgLogRestrictions[$this->type]=='*' ) {
                                $titleObj = SpecialPage::getTitleFor( 'Log', $this->type );
                                $rcComment = $this->getRcComment();
-                               RecentChange::notifyLog( $now, $titleObj, $wgUser, $rcComment, '',
+                               RecentChange::notifyLog( $now, $titleObj, $this->doer, $rcComment, '',
                                        $this->type, $this->action, $this->target, $this->comment, $this->params, $newId );
                        }
                }
@@ -137,16 +136,19 @@ class LogPage {
         * @return string Headertext of this logtype
         */
        static function logHeader( $type ) {
-               global $wgLogHeaders;
+               global $wgLogHeaders, $wgMessageCache;
+               $wgMessageCache->loadAllMessages();
                return wfMsgExt($wgLogHeaders[$type],array('parseinline'));
        }
 
        /**
         * @static
+        * @return HTML string
         */
        static function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false ) {
-               global $wgLang, $wgContLang, $wgLogActions;
+               global $wgLang, $wgContLang, $wgLogActions, $wgMessageCache;
 
+               $wgMessageCache->loadAllMessages();
                $key = "$type/$action";
 
                if( $key == 'patrol/patrol' )
@@ -193,6 +195,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' );
                                        }
@@ -245,8 +252,9 @@ class LogPage {
         * @param object &$target A title object.
         * @param string $comment Description associated
         * @param array $params Parameters passed later to wfMsg.* functions
+        * @param User $doer The user doing the action
         */
-       function addEntry( $action, $target, $comment, $params = array() ) {
+       function addEntry( $action, $target, $comment, $params = array(), $doer = null ) {
                if ( !is_array( $params ) ) {
                        $params = array( $params );
                }
@@ -255,6 +263,15 @@ class LogPage {
                $this->target = $target;
                $this->comment = $comment;
                $this->params = LogPage::makeParamBlob( $params );
+               
+               if ($doer === null) {
+                       global $wgUser;
+                       $doer = $wgUser;
+               } elseif (!is_object( $doer ) ) {
+                       $doer = User::newFromId( $doer );
+               }
+               
+               $this->doer = $doer;
 
                $this->actionText = LogPage::actionText( $this->type, $action, $target, NULL, $params );