Switch jquery.sortable to use mw-sortable and mw-unsortable classes, to be in line...

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

diff --git a/includes/LogPage.php b/includes/LogPage.php
index fcd553e..4afa12f 100644 (file)
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -38,7 +38,18 @@ class LogPage {
        const SUPPRESSED_USER = 12;
        const SUPPRESSED_ACTION = 9;
        /* @access private */
-       var $type, $action, $comment, $params, $target, $doer;
+       var $type, $action, $comment, $params;
+
+       /**
+        * @var User
+        */
+       var $doer;
+
+       /**
+        * @var Title
+        */
+       var $target;
+
        /* @acess public */
        var $updateRecentChanges, $sendToUDP;
 
@@ -56,6 +67,9 @@ class LogPage {
                $this->sendToUDP = ( $udp == 'UDP' );
        }
 
+       /**
+        * @return bool|int|null
+        */
        protected function saveContent() {
                global $wgLogRestrictions;
 
@@ -259,7 +273,7 @@ class LogPage {
                                                }
 
                                        // Page moves
-                                       } elseif ( $type == 'move' && count( $params ) == 3 && $action != 'move_rev' ) {
+                                       } elseif ( $type == 'move' && count( $params ) == 3 ) {
                                                if( $params[2] ) {
                                                        if ( $skin ) {
                                                                $details .= ' [' . wfMsg( 'move-redirect-suppressed' ) . ']';
@@ -318,6 +332,14 @@ class LogPage {
                return $rv;
        }
 
+       /**
+        * TODO document
+        * @param  $type String
+        * @param  $skin Skin
+        * @param  $title Title
+        * @param  $params Array
+        * @return String
+        */
        protected static function getTitleLink( $type, $skin, $title, &$params ) {
                global $wgLang, $wgContLang, $wgUserrightsInterwikiDelimiter;
                if( !$skin ) {
@@ -325,7 +347,7 @@ class LogPage {
                }
                switch( $type ) {
                        case 'move':
-                               $titleLink = $skin->link(
+                               $titleLink = Linker::link(
                                        $title,
                                        htmlspecialchars( $title->getPrefixedText() ),
                                        array(),
@@ -336,7 +358,7 @@ class LogPage {
                                        # Workaround for broken database
                                        $params[0] = htmlspecialchars( $params[0] );
                                } else {
-                                       $params[0] = $skin->link(
+                                       $params[0] = Linker::link(
                                                $targetTitle,
                                                htmlspecialchars( $params[0] )
                                        );
@@ -349,8 +371,8 @@ class LogPage {
                                        // TODO: Store the user identifier in the parameters
                                        // to make this faster for future log entries
                                        $id = User::idFromName( $title->getText() );
-                                       $titleLink = $skin->userLink( $id, $title->getText() )
-                                               . $skin->userToolLinks( $id, $title->getText(), false, Linker::TOOL_LINKS_NOBLOCK );
+                                       $titleLink = Linker::userLink( $id, $title->getText() )
+                                               . Linker::userToolLinks( $id, $title->getText(), false, Linker::TOOL_LINKS_NOBLOCK );
                                }
                                break;
                        case 'rights':
@@ -363,16 +385,16 @@ class LogPage {
                                                break;
                                        }
                                }
-                               $titleLink = $skin->link( Title::makeTitle( NS_USER, $text ) );
+                               $titleLink = Linker::link( Title::makeTitle( NS_USER, $text ) );
                                break;
                        case 'merge':
-                               $titleLink = $skin->link(
+                               $titleLink = Linker::link(
                                        $title,
                                        $title->getPrefixedText(),
                                        array(),
                                        array( 'redirect' => 'no' )
                                );
-                               $params[0] = $skin->link(
+                               $params[0] = Linker::link(
                                        Title::newFromText( $params[0] ),
                                        htmlspecialchars( $params[0] )
                                );
@@ -380,15 +402,15 @@ class LogPage {
                                break;
                        default:
                                if( $title->getNamespace() == NS_SPECIAL ) {
-                                       list( $name, $par ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() );
+                                       list( $name, $par ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
                                        # Use the language name for log titles, rather than Log/X
                                        if( $name == 'Log' ) {
-                                               $titleLink = '(' . $skin->link( $title, LogPage::logName( $par ) ) . ')';
+                                               $titleLink = '(' . Linker::link( $title, LogPage::logName( $par ) ) . ')';
                                        } else {
-                                               $titleLink = $skin->link( $title );
+                                               $titleLink = Linker::link( $title );
                                        }
                                } else {
-                                       $titleLink = $skin->link( $title );
+                                       $titleLink = Linker::link( $title );
                                }
                }
                return $titleLink;
@@ -506,7 +528,7 @@ class LogPage {
        /**
         * Translate a block log flag if possible
         *
-        * @param $flag Flag to translate
+        * @param $flag int Flag to translate
         * @param $forContent Whether to localize the message depending of the user
         *                    language
         * @return String
@@ -514,13 +536,15 @@ class LogPage {
        public static function formatBlockFlag( $flag, $forContent = false ) {
                static $messages = array();
                if( !isset( $messages[$flag] ) ) {
-                       $k = 'block-log-flags-' . $flag;
-                       if( $forContent ) {
-                               $msg = wfMsgForContent( $k );
-                       } else {
-                               $msg = wfMsg( $k );
+                       $messages[$flag] = htmlspecialchars( $flag ); // Fallback
+
+                       $msg = wfMessage( 'block-log-flags-' . $flag );
+                       if ( $forContent ) {
+                               $msg->inContentLanguage();
+                       }
+                       if ( $msg->exists() ) {
+                               $messages[$flag] = $msg->escaped();
                        }
-                       $messages[$flag] = htmlspecialchars( wfEmptyMsg( $k, $msg ) ? $flag : $msg );
                }
                return $messages[$flag];
        }