Revert r19877; no reason is given for it but it breaks things such as parameter subst...

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

diff --git a/includes/SpecialLog.php b/includes/SpecialLog.php
index e32d224..409ca23 100644 (file)
--- a/includes/SpecialLog.php
+++ b/includes/SpecialLog.php
@@ -19,8 +19,7 @@
 
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
@@ -38,8 +37,7 @@ function wfSpecialLog( $par = '' ) {
 
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 class LogReader {
        var $db, $joinClauses, $whereClauses;
@@ -49,7 +47,7 @@ class LogReader {
         * @param WebRequest $request For internal use use a FauxRequest object to pass arbitrary parameters.
         */
        function LogReader( $request ) {
-               $this->db =& wfGetDB( DB_SLAVE );
+               $this->db = wfGetDB( DB_SLAVE );
                $this->setupQuery( $request );
        }
 
@@ -97,7 +95,7 @@ class LogReader {
        function limitUser( $name ) {
                if ( $name == '' )
                        return false;
-               $usertitle = Title::makeTitle( NS_USER, $name );
+               $usertitle = Title::makeTitleSafe( NS_USER, $name );
                if ( is_null( $usertitle ) )
                        return false;
                $this->user = $usertitle->getText();
@@ -151,7 +149,6 @@ class LogReader {
         */
        function getQuery() {
                $logging = $this->db->tableName( "logging" );
-               $user = $this->db->tableName( 'user' );
                $sql = "SELECT /*! STRAIGHT_JOIN */ log_type, log_action, log_timestamp,
                        log_user, user_name,
                        log_namespace, log_title, page_id,
@@ -204,8 +201,7 @@ class LogReader {
 
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 class LogViewer {
        /**
@@ -219,7 +215,7 @@ class LogViewer {
         */
        function LogViewer( &$reader ) {
                global $wgUser;
-               $this->skin =& $wgUser->getSkin();
+               $this->skin = $wgUser->getSkin();
                $this->reader =& $reader;
        }
 
@@ -253,8 +249,8 @@ class LogViewer {
                $batch = new LinkBatch;
                while ( $s = $result->fetchObject() ) {
                        // User link
-                       $title = Title::makeTitleSafe( NS_USER, $s->user_name );
-                       $batch->addObj( $title );
+                       $batch->addObj( Title::makeTitleSafe( NS_USER, $s->user_name ) );
+                       $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $s->user_name ) );
 
                        // Move destination link
                        if ( $s->log_type == 'move' ) {
@@ -304,7 +300,6 @@ class LogViewer {
        function logLine( $s ) {
                global $wgLang;
                $title = Title::makeTitle( $s->log_namespace, $s->log_title );
-               $user = Title::makeTitleSafe( NS_USER, $s->user_name );
                $time = $wgLang->timeanddate( wfTimestamp(TS_MW, $s->log_timestamp), true );
 
                // Enter the existence or non-existence of this page into the link cache,
@@ -316,12 +311,12 @@ class LogViewer {
                        $linkCache->addBadLinkObj( $title );
                }
 
-               $userLink = $this->skin->userLink( $s->log_user, $s->user_name ) . $this->skin->userToolLinks( $s->log_user, $s->user_name );
+               $userLink = $this->skin->userLink( $s->log_user, $s->user_name ) . $this->skin->userToolLinksRedContribs( $s->log_user, $s->user_name );
                $comment = $this->skin->commentBlock( $s->log_comment );
                $paramArray = LogPage::extractParams( $s->log_params );
                $revert = '';
                if ( $s->log_type == 'move' && isset( $paramArray[0] ) ) {
-                       $specialTitle = Title::makeTitle( NS_SPECIAL, 'Movepage' );
+                       $specialTitle = SpecialPage::getTitleFor( 'Movepage' );
                        $destTitle = Title::newFromText( $paramArray[0] );
                        if ( $destTitle ) {
                                $revert = '(' . $this->skin->makeKnownLinkObj( $specialTitle, wfMsg( 'revertmove' ),
@@ -356,14 +351,14 @@ class LogViewer {
        function showOptions( &$out ) {
                global $wgScript;
                $action = htmlspecialchars( $wgScript );
-               $title = Title::makeTitle( NS_SPECIAL, 'Log' );
+               $title = SpecialPage::getTitleFor( 'Log' );
                $special = htmlspecialchars( $title->getPrefixedDBkey() );
                $out->addHTML( "<form action=\"$action\" method=\"get\">\n" .
-                       "<input type='hidden' name='title' value=\"$special\" />\n" .
-                       $this->getTypeMenu() .
-                       $this->getUserInput() .
-                       $this->getTitleInput() .
-                       "<input type='submit' value=\"" . wfMsg( 'allpagessubmit' ) . "\" />" .
+                       Xml::hidden( 'title', $special ) . "\n" .
+                       $this->getTypeMenu() . "\n" .
+                       $this->getUserInput() . "\n" .
+                       $this->getTitleInput() . "\n" .
+                       Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
                        "</form>" );
        }
 
@@ -374,11 +369,11 @@ class LogViewer {
        function getTypeMenu() {
                $out = "<select name='type'>\n";
                foreach( LogPage::validTypes() as $type ) {
-                       $text = htmlspecialchars( LogPage::logName( $type ) );
-                       $selected = ($type == $this->reader->queryType()) ? ' selected="selected"' : '';
-                       $out .= "<option value=\"$type\"$selected>$text</option>\n";
+                       $text = LogPage::logName( $type );
+                       $selected = ($type == $this->reader->queryType());
+                       $out .= Xml::option( $text, $type, $selected ) . "\n";
                }
-               $out .= "</select>\n";
+               $out .= '</select>';
                return $out;
        }
 
@@ -387,8 +382,8 @@ class LogViewer {
         * @private
         */
        function getUserInput() {
-               $user = htmlspecialchars( $this->reader->queryUser() );
-               return wfMsg('specialloguserlabel') . "<input type='text' name='user' size='12' value=\"$user\" />\n";
+               $user =  $this->reader->queryUser();
+               return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'user', 12, $user );
        }
 
        /**
@@ -396,8 +391,8 @@ class LogViewer {
         * @private
         */
        function getTitleInput() {
-               $title = htmlspecialchars( $this->reader->queryTitle() );
-               return wfMsg('speciallogtitlelabel') . "<input type='text' name='page' size='20' value=\"$title\" />\n";
+               $title = $this->reader->queryTitle();
+               return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'page', 20, $title );
        }
 
        /**