Merge "Message: Use RequestContext instead of $wgLang"

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

diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 82e5808..daaff07 100644 (file)
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -97,7 +97,7 @@ class LogPage {
 
                // @todo FIXME private/protected/public property?
                $this->timestamp = $now = wfTimestampNow();
-               $data = array(
+               $data = [
                        'log_id' => $log_id,
                        'log_type' => $this->type,
                        'log_action' => $this->action,
@@ -109,7 +109,7 @@ class LogPage {
                        'log_page' => $this->target->getArticleID(),
                        'log_comment' => $this->comment,
                        'log_params' => $this->params
-               );
+               ];
                $dbw->insert( 'logging', $data, __METHOD__ );
                $newId = !is_null( $log_id ) ? $log_id : $dbw->insertId();
 
@@ -211,42 +211,6 @@ class LogPage {
                return in_array( $type, LogPage::validTypes() );
        }
 
-       /**
-        * Get the name for the given log type
-        *
-        * @param string $type Log type
-        * @return string Log name
-        * @deprecated since 1.19, warnings in 1.21. Use getName()
-        */
-       public static function logName( $type ) {
-               global $wgLogNames;
-
-               wfDeprecated( __METHOD__, '1.21' );
-
-               if ( isset( $wgLogNames[$type] ) ) {
-                       return str_replace( '_', ' ', wfMessage( $wgLogNames[$type] )->text() );
-               } else {
-                       // Bogus log types? Perhaps an extension was removed.
-                       return $type;
-               }
-       }
-
-       /**
-        * Get the log header for the given log type
-        *
-        * @todo handle missing log types
-        * @param string $type Logtype
-        * @return string Header text of this logtype
-        * @deprecated since 1.19, warnings in 1.21. Use getDescription()
-        */
-       public static function logHeader( $type ) {
-               global $wgLogHeaders;
-
-               wfDeprecated( __METHOD__, '1.21' );
-
-               return wfMessage( $wgLogHeaders[$type] )->parse();
-       }
-
        /**
         * Generate text for a log entry.
         * Only LogFormatter should call this function.
@@ -261,7 +225,7 @@ class LogPage {
         * @return string HTML
         */
        public static function actionText( $type, $action, $title = null, $skin = null,
-               $params = array(), $filterWikilinks = false
+               $params = [], $filterWikilinks = false
        ) {
                global $wgLang, $wgContLang, $wgLogActions;
 
@@ -285,30 +249,10 @@ class LogPage {
                                        $rv = wfMessage( $wgLogActions[$key] )->rawParams( $titleLink )
                                                ->inLanguage( $langObj )->escaped();
                                } else {
-                                       $details = '';
                                        array_unshift( $params, $titleLink );
 
-                                       // Page protections
-                                       if ( $type == 'protect' && count( $params ) == 3 ) {
-                                               // Restrictions and expiries
-                                               if ( $skin ) {
-                                                       $details .= $wgLang->getDirMark() . htmlspecialchars( " {$params[1]}" );
-                                               } else {
-                                                       $details .= " {$params[1]}";
-                                               }
-
-                                               // Cascading flag...
-                                               if ( $params[2] ) {
-                                                       $text = wfMessage( 'protect-summary-cascade' )
-                                                               ->inLanguage( $langObj )->text();
-                                                       $details .= ' ';
-                                                       $details .= wfMessage( 'brackets', $text )->inLanguage( $langObj )->text();
-
-                                               }
-                                       }
-
                                        $rv = wfMessage( $wgLogActions[$key] )->rawParams( $params )
-                                                       ->inLanguage( $langObj )->escaped() . $details;
+                                                       ->inLanguage( $langObj )->escaped();
                                }
                        }
                } else {
@@ -387,11 +331,11 @@ class LogPage {
         *
         * @return int The log_id of the inserted log entry
         */
-       public function addEntry( $action, $target, $comment, $params = array(), $doer = null ) {
+       public function addEntry( $action, $target, $comment, $params = [], $doer = null ) {
                global $wgContLang;
 
                if ( !is_array( $params ) ) {
-                       $params = array( $params );
+                       $params = [ $params ];
                }
 
                if ( $comment === null ) {
@@ -450,14 +394,14 @@ class LogPage {
                        return false; // nothing
                }
 
-               $data = array();
+               $data = [];
 
                foreach ( $values as $value ) {
-                       $data[] = array(
+                       $data[] = [
                                'ls_field' => $field,
                                'ls_value' => $value,
                                'ls_log_id' => $logid
-                       );
+                       ];
                }
 
                $dbw = wfGetDB( DB_MASTER );
@@ -484,7 +428,7 @@ class LogPage {
         */
        public static function extractParams( $blob ) {
                if ( $blob === '' ) {
-                       return array();
+                       return [];
                } else {
                        return explode( "\n", $blob );
                }