Merge "Fix to avoid IE "compatibility view""

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

diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 46accb5..f5798e2 100644 (file)
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -40,31 +40,37 @@ class LogPage {
        const SUPPRESSED_ACTION = 9;
 
        /** @var bool */
-       var $updateRecentChanges;
+       public $updateRecentChanges;
 
        /** @var bool */
-       var $sendToUDP;
+       public $sendToUDP;
+
+       /** @var string Plaintext version of the message for IRC */
+       private $ircActionText;
+
+       /** @var string Plaintext version of the message */
+       private $actionText;
 
        /** @var string One of '', 'block', 'protect', 'rights', 'delete',
         *    'upload', 'move'
         */
-       var $type;
+       private $type;
 
        /** @var string One of '', 'block', 'protect', 'rights', 'delete',
         *   'upload', 'move', 'move_redir' */
-       var $action;
+       private $action;
 
        /** @var string Comment associated with action */
-       var $comment;
+       private $comment;
 
        /** @var string Blob made of a parameters array */
-       var $params;
+       private $params;
 
        /** @var User The user doing the action */
-       var $doer;
+       private $doer;
 
        /** @var Title */
-       var $target;
+       private $target;
 
        /**
         * Constructor
@@ -89,6 +95,7 @@ class LogPage {
                $dbw = wfGetDB( DB_MASTER );
                $log_id = $dbw->nextSequenceValue( 'logging_log_id_seq' );
 
+               // @todo FIXME private/protected/public property?
                $this->timestamp = $now = wfTimestampNow();
                $data = array(
                        'log_id' => $log_id,
@@ -129,7 +136,7 @@ class LogPage {
                                $this->type, $this->action, $this->target, $this->comment,
                                $this->params, $newId, $this->getRcCommentIRC()
                        );
-                       $rc->notifyRC2UDP();
+                       $rc->notifyRCFeeds();
                }
 
                return $newId;
@@ -213,6 +220,8 @@ class LogPage {
        public static function logName( $type ) {
                global $wgLogNames;
 
+               wfDeprecated( __METHOD__, '1.21' );
+
                if ( isset( $wgLogNames[$type] ) ) {
                        return str_replace( '_', ' ', wfMessage( $wgLogNames[$type] )->text() );
                } else {
@@ -232,6 +241,8 @@ class LogPage {
        public static function logHeader( $type ) {
                global $wgLogHeaders;
 
+               wfDeprecated( __METHOD__, '1.21' );
+
                return wfMessage( $wgLogHeaders[$type] )->parse();
        }