remove extra whitespace; testing commit notifications

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

diff --git a/includes/LogPage.php b/includes/LogPage.php
index ecab3d8..02cde2a 100644 (file)
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -55,42 +55,52 @@ class LogPage {
 
                $dbw = wfGetDB( DB_MASTER );
                $uid = $wgUser->getID();
+               $log_id = $dbw->nextSequenceValue( 'log_log_id_seq' );
 
                $this->timestamp = $now = wfTimestampNow();
-               $dbw->insert( 'logging',
-                       array(
-                               'log_type' => $this->type,
-                               'log_action' => $this->action,
-                               'log_timestamp' => $dbw->timestamp( $now ),
-                               'log_user' => $uid,
-                               'log_namespace' => $this->target->getNamespace(),
-                               'log_title' => $this->target->getDBkey(),
-                               'log_comment' => $this->comment,
-                               'log_params' => $this->params
-                       ), $fname
+               $data = array(
+                       'log_type' => $this->type,
+                       'log_action' => $this->action,
+                       'log_timestamp' => $dbw->timestamp( $now ),
+                       'log_user' => $uid,
+                       'log_namespace' => $this->target->getNamespace(),
+                       'log_title' => $this->target->getDBkey(),
+                       'log_comment' => $this->comment,
+                       'log_params' => $this->params
                );
 
+               # log_id doesn't exist on Wikimedia servers yet, and it's a tricky 
+               # schema update to do. Hack it for now to ignore the field on MySQL.
+               if ( !is_null( $log_id ) ) {
+                       $data['log_id'] = $log_id;
+               }
+               $dbw->insert( 'logging', $data, $fname );
+
                # And update recentchanges
                if ( $this->updateRecentChanges ) {
                        $titleObj = SpecialPage::getTitleFor( 'Log', $this->type );
-                       $rcComment = $this->actionText;
-                       if( '' != $this->comment ) {
-                               if ($rcComment == '')
-                                       $rcComment = $this->comment;
-                               else
-                                       $rcComment .= ': ' . $this->comment;
-                       }
-
+                       $rcComment = $this->getRcComment();
                        RecentChange::notifyLog( $now, $titleObj, $wgUser, $rcComment, '',
                                $this->type, $this->action, $this->target, $this->comment, $this->params );
                }
                return true;
        }
 
+       public function getRcComment() {
+               $rcComment = $this->actionText;
+               if( '' != $this->comment ) {
+                       if ($rcComment == '')
+                               $rcComment = $this->comment;
+                       else
+                               $rcComment .= ': ' . $this->comment;
+               }
+               return $rcComment;
+       }
+
        /**
         * @static
         */
-       function validTypes() {
+       public static function validTypes() {
                global $wgLogTypes;
                return $wgLogTypes;
        }
@@ -98,7 +108,7 @@ class LogPage {
        /**
         * @static
         */
-       function isLogType( $type ) {
+       public static function isLogType( $type ) {
                return in_array( $type, LogPage::validTypes() );
        }
 
@@ -117,10 +127,10 @@ class LogPage {
        }
 
        /**
-        * @fixme: handle missing log types
+        * @todo handle missing log types
         * @static
         */
-       function logHeader( $type ) {
+       static function logHeader( $type ) {
                global $wgLogHeaders;
                return wfMsg( $wgLogHeaders[$type] );
        }
@@ -128,7 +138,7 @@ class LogPage {
        /**
         * @static
         */
-       function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false, $translate=false ) {
+       static function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false, $translate=false ) {
                global $wgLang, $wgContLang, $wgLogActions;
 
                $key = "$type/$action";
@@ -233,7 +243,7 @@ class LogPage {
         * Create a blob from a parameter array
         * @static
         */
-       function makeParamBlob( $params ) {
+       static function makeParamBlob( $params ) {
                return implode( "\n", $params );
        }
 
@@ -241,7 +251,7 @@ class LogPage {
         * Extract a parameter array from a blob
         * @static
         */
-       function extractParams( $blob ) {
+       static function extractParams( $blob ) {
                if ( $blob === '' ) {
                        return array();
                } else {