Reverting r16861; incompatible change to message texts, breaks a lot of toggle displa...

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

diff --git a/includes/SpecialLog.php b/includes/SpecialLog.php
index f673306..e32d224 100644 (file)
--- a/includes/SpecialLog.php
+++ b/includes/SpecialLog.php
@@ -28,11 +28,11 @@
  */
 function wfSpecialLog( $par = '' ) {
        global $wgRequest;
-       $logReader =& new LogReader( $wgRequest );
+       $logReader = new LogReader( $wgRequest );
        if( $wgRequest->getVal( 'type' ) == '' && $par != '' ) {
                $logReader->limitType( $par );
        }
-       $logViewer =& new LogViewer( $logReader );
+       $logViewer = new LogViewer( $logReader );
        $logViewer->show();
 }
 
@@ -56,7 +56,7 @@ class LogReader {
        /**
         * Basic setup and applies the limiting factors from the WebRequest object.
         * @param WebRequest $request
-        * @access private
+        * @private
         */
        function setupQuery( $request ) {
                $page = $this->db->tableName( 'page' );
@@ -78,7 +78,7 @@ class LogReader {
        /**
         * Set the log reader to return only entries of the given type.
         * @param string $type A log type ('upload', 'delete', etc)
-        * @access private
+        * @private
         */
        function limitType( $type ) {
                if( empty( $type ) ) {
@@ -92,7 +92,7 @@ class LogReader {
        /**
         * Set the log reader to return only entries by the given user.
         * @param string $name (In)valid user name
-        * @access private
+        * @private
         */
        function limitUser( $name ) {
                if ( $name == '' )
@@ -116,7 +116,7 @@ class LogReader {
         * Set the log reader to return only entries affecting the given page.
         * (For the block and rights logs, this is a user page.)
         * @param string $page Title name as text
-        * @access private
+        * @private
         */
        function limitTitle( $page ) {
                $title = Title::newFromText( $page );
@@ -133,7 +133,7 @@ class LogReader {
         * Set the log reader to return only entries in a given time range.
         * @param string $time Timestamp of one endpoint
         * @param string $direction either ">=" or "<=" operators
-        * @access private
+        * @private
         */
        function limitTime( $time, $direction ) {
                # Direction should be a comparison operator
@@ -147,7 +147,7 @@ class LogReader {
        /**
         * Build an SQL query from all the set parameters.
         * @return string the SQL query
-        * @access private
+        * @private
         */
        function getQuery() {
                $logging = $this->db->tableName( "logging" );
@@ -299,7 +299,7 @@ class LogViewer {
        /**
         * @param Object $s a single row from the result set
         * @return string Formatted HTML list item
-        * @access private
+        * @private
         */
        function logLine( $s ) {
                global $wgLang;
@@ -316,7 +316,7 @@ class LogViewer {
                        $linkCache->addBadLinkObj( $title );
                }
 
-               $userLink = $this->skin->makeLinkObj( $user, htmlspecialchars( $s->user_name ) );
+               $userLink = $this->skin->userLink( $s->log_user, $s->user_name ) . $this->skin->userToolLinks( $s->log_user, $s->user_name );
                $comment = $this->skin->commentBlock( $s->log_comment );
                $paramArray = LogPage::extractParams( $s->log_params );
                $revert = '';
@@ -339,7 +339,7 @@ class LogViewer {
 
        /**
         * @param OutputPage &$out where to send output
-        * @access private
+        * @private
         */
        function showHeader( &$out ) {
                $type = $this->reader->queryType();
@@ -351,7 +351,7 @@ class LogViewer {
 
        /**
         * @param OutputPage &$out where to send output
-        * @access private
+        * @private
         */
        function showOptions( &$out ) {
                global $wgScript;
@@ -369,7 +369,7 @@ class LogViewer {
 
        /**
         * @return string Formatted HTML
-        * @access private
+        * @private
         */
        function getTypeMenu() {
                $out = "<select name='type'>\n";
@@ -384,7 +384,7 @@ class LogViewer {
 
        /**
         * @return string Formatted HTML
-        * @access private
+        * @private
         */
        function getUserInput() {
                $user = htmlspecialchars( $this->reader->queryUser() );
@@ -393,7 +393,7 @@ class LogViewer {
 
        /**
         * @return string Formatted HTML
-        * @access private
+        * @private
         */
        function getTitleInput() {
                $title = htmlspecialchars( $this->reader->queryTitle() );
@@ -402,7 +402,7 @@ class LogViewer {
 
        /**
         * @param OutputPage &$out where to send output
-        * @access private
+        * @private
         */
        function showPrevNext( &$out ) {
                global $wgContLang,$wgRequest;