Making INNER JOIN implicit

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

diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index 5151180..19f39dd 100644 (file)
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -67,7 +67,7 @@ class RecentChange
                $rc->numberofWatchingusers = false;
                return $rc;
        }
-       
+
        /**
         * Obtain the recent change with a given rc_id value
         *
@@ -85,7 +85,7 @@ class RecentChange
                        return NULL;
                }
        }
-       
+
        /**
         * Find the first recent change matching some specific conditions
         *
@@ -296,7 +296,12 @@ class RecentChange
                        'rc_patrolled'  => 0,
                        'rc_new'        => 0,  # obsolete
                        'rc_old_len'    => $oldSize,
-                       'rc_new_len'    => $newSize
+                       'rc_new_len'    => $newSize,
+                       'rc_deleted'    => 0,
+                       'rc_logid'              => 0,
+                       'rc_log_type'   => null,
+                       'rc_log_action' => '',
+                       'rc_params'             => ''
                );
 
                $rc->mExtra =  array(
@@ -343,9 +348,14 @@ class RecentChange
                        'rc_moved_to_title' => '',
                        'rc_ip'             => $ip,
                        'rc_patrolled'      => 0,
-                       'rc_new'            => 1, # obsolete
+                       'rc_new'                => 1, # obsolete
                        'rc_old_len'        => 0,
-                       'rc_new_len'        => $size
+                       'rc_new_len'        => $size,
+                       'rc_deleted'            => 0,
+                       'rc_logid'                      => 0,
+                       'rc_log_type'           => null,
+                       'rc_log_action'         => '',
+                       'rc_params'                     => ''
                );
 
                $rc->mExtra =  array(
@@ -392,6 +402,11 @@ class RecentChange
                        'rc_patrolled'  => 1,
                        'rc_old_len'    => NULL,
                        'rc_new_len'    => NULL,
+                       'rc_deleted'    => 0,
+                       'rc_logid'              => 0, # notifyMove not used anymore
+                       'rc_log_type'   => null,
+                       'rc_log_action' => '',
+                       'rc_params'             => ''
                );
 
                $rc->mExtra = array(
@@ -410,10 +425,9 @@ class RecentChange
                RecentChange::notifyMove( $timestamp, $oldTitle, $newTitle, $user, $comment, $ip, true );
        }
 
-       # A log entry is different to an edit in that previous revisions are
-       # not kept
-       public static function notifyLog( $timestamp, &$title, &$user, $comment, $ip='',
-          $type, $action, $target, $logComment, $params )
+       # A log entry is different to an edit in that previous revisions are not kept
+       public static function notifyLog( $timestamp, &$title, &$user, $actionComment, $ip='',
+          $type, $action, $target, $logComment, $params, $newId=0 )
        {
                global $wgRequest;
 
@@ -428,14 +442,14 @@ class RecentChange
                $rc->mAttribs = array(
                        'rc_timestamp'  => $timestamp,
                        'rc_cur_time'   => $timestamp,
-                       'rc_namespace'  => $title->getNamespace(),
-                       'rc_title'      => $title->getDBkey(),
+                       'rc_namespace'  => $target->getNamespace(),
+                       'rc_title'      => $target->getDBkey(),
                        'rc_type'       => RC_LOG,
                        'rc_minor'      => 0,
-                       'rc_cur_id'     => $title->getArticleID(),
+                       'rc_cur_id'     => $target->getArticleID(),
                        'rc_user'       => $user->getID(),
                        'rc_user_text'  => $user->getName(),
-                       'rc_comment'    => $comment,
+                       'rc_comment'    => $logComment,
                        'rc_this_oldid' => 0,
                        'rc_last_oldid' => 0,
                        'rc_bot'        => $user->isAllowed( 'bot' ) ? $wgRequest->getBool( 'bot' , true ) : 0,
@@ -446,15 +460,16 @@ class RecentChange
                        'rc_new'        => 0, # obsolete
                        'rc_old_len'    => NULL,
                        'rc_new_len'    => NULL,
+                       'rc_deleted'    => 0,
+                       'rc_logid'              => $newId,
+                       'rc_log_type'   => $type,
+                       'rc_log_action' => $action,
+                       'rc_params'             => $params
                );
                $rc->mExtra =  array(
                        'prefixedDBkey' => $title->getPrefixedDBkey(),
                        'lastTimestamp' => 0,
-                       'logType' => $type,
-                       'logAction' => $action,
-                       'logComment' => $logComment,
-                       'logTarget' => $target,
-                       'logParams' => $params
+                       'actionComment' => $actionComment, // the comment appended to the action, passed from LogPage
                );
                $rc->save();
        }
@@ -545,18 +560,13 @@ class RecentChange
                extract($this->mAttribs);
                extract($this->mExtra);
 
-               $titleObj =& $this->getTitle();
                if ( $rc_type == RC_LOG ) {
-                       $title = MWNamespace::getCanonicalName( $titleObj->getNamespace() ) . $titleObj->getText();
+                       $titleObj = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL );
                } else {
-                       $title = $titleObj->getPrefixedText();
+                       $titleObj =& $this->getTitle();
                }
-               $title = $this->cleanupForIRC( $title );
-
-               $bad = array("\n", "\r");
-               $empty = array("", "");
                $title = $titleObj->getPrefixedText();
-               $title = str_replace($bad, $empty, $title);
+               $title = $this->cleanupForIRC( $title );
 
                // FIXME: *HACK* these should be getFullURL(), hacked for SSL madness --brion 2005-12-26
                if ( $rc_type == RC_LOG ) {
@@ -586,9 +596,9 @@ class RecentChange
                $user = $this->cleanupForIRC( $rc_user_text );
 
                if ( $rc_type == RC_LOG ) {
-                       $logTargetText = $logTarget->getPrefixedText();
-                       $comment = $this->cleanupForIRC( str_replace( $logTargetText, "\00302$logTargetText\00310", $rc_comment ) );
-                       $flag = $logAction;
+                       $logTargetText = $this->getTitle()->getPrefixedText();
+                       $comment = $this->cleanupForIRC( str_replace($logTargetText,"\00302$logTargetText\00310",$actionComment) );
+                       $flag = $rc_log_action;
                } else {
                        $comment = $this->cleanupForIRC( $rc_comment );
                        $flag = ($rc_minor ? "M" : "") . ($rc_new ? "N" : "");
@@ -633,5 +643,3 @@ class RecentChange
                }
        }
 }
-
-