Remove old nonsensical code

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

diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index d05f5fc..b4abc1b 100644 (file)
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -25,7 +25,7 @@
  *     rc_patrolled    boolean whether or not someone has marked this edit as patrolled
  *     rc_old_len      integer byte length of the text before the edit
  *     rc_new_len      the same after the edit
- *     rc_deleted              partial deletion
+  *    rc_deleted              partial deletion
  *     rc_logid                the log_id value for this log entry (or zero)
  *  rc_log_type                the log type (or null)
  *     rc_log_action   the log action (or null)
@@ -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
         *
@@ -426,7 +426,7 @@ class RecentChange
        }
 
        # A log entry is different to an edit in that previous revisions are not kept
-       public static function notifyLog( $timestamp, &$title, &$user, $comment, $ip='',
+       public static function notifyLog( $timestamp, &$title, &$user, $actionComment, $ip='',
           $type, $action, $target, $logComment, $params, $newId=0 )
        {
                global $wgRequest;
@@ -469,11 +469,7 @@ class RecentChange
                $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();
        }
@@ -511,11 +507,12 @@ class RecentChange
                        'rc_new' => $row->page_is_new, # obsolete
                        'rc_old_len' => $row->rc_old_len,
                        'rc_new_len' => $row->rc_new_len,
-                       'rc_deleted'  => $row->rc_deleted,
-                       'rc_logid'      => $row->rc_logid,
-                       'rc_log_type'   => $row->rc_log_type,
-                       'rc_log_action' => $row->rc_log_action,
-                       'rc_params'     => $row->rc_params
+                       'rc_params' => isset($row->rc_params) ? $row->rc_params : '',
+                       'rc_log_type' => isset($row->rc_log_type) ? $row->rc_log_type : null,
+                       'rc_log_action' => isset($row->rc_log_action) ? $row->rc_log_action : null,
+                       'rc_log_id' => isset($row->rc_log_id) ? $row->rc_log_id: 0,
+                       // this one REALLY should be set...
+                       'rc_deleted' => isset($row->rc_deleted) ? $row->rc_deleted: 0,
                );
 
                $this->mExtra = array();
@@ -563,18 +560,13 @@ class RecentChange
                extract($this->mAttribs);
                extract($this->mExtra);
 
-               $titleObj =& $this->getTitle();
                if ( $rc_type == RC_LOG ) {
-                       $title = Namespace::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 ) {
@@ -604,9 +596,8 @@ 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;
+                       $comment = $this->cleanupForIRC( str_replace( $title, "\00302$title\00310", $actionComment ) );
+                       $flag = $rc_log_action;
                } else {
                        $comment = $this->cleanupForIRC( $rc_comment );
                        $flag = ($rc_minor ? "M" : "") . ($rc_new ? "N" : "");
@@ -651,5 +642,3 @@ class RecentChange
                }
        }
 }
-
-