Avoid PHP Notices in Translate from messages.inc

[lhc/web/wiklou.git] / maintenance / rebuildrecentchanges.php

diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php
index 8bd0458..92d6090 100644 (file)
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -31,8 +31,6 @@ class RebuildRecentchanges extends Maintenance {
        }
 
        public function execute() {
-               global $wgTitle;
-               $wgTitle = Title::newFromText( "Rebuild recent changes script" );
                $this->rebuildRecentChangesTablePass1();
                $this->rebuildRecentChangesTablePass2();
                $this->rebuildRecentChangesTablePass3();
@@ -45,16 +43,15 @@ class RebuildRecentchanges extends Maintenance {
         * Rebuild pass 1
         * DOCUMENT ME!
         */
-       function rebuildRecentChangesTablePass1()
-       {
+       private function rebuildRecentChangesTablePass1() {
                $dbw = wfGetDB( DB_MASTER );
-       
+
                $dbw->delete( 'recentchanges', '*' );
-       
+
                $this->output( "Loading from page and revision tables...\n" );
-       
+
                global $wgRCMaxAge;
-       
+
                $this->output( '$wgRCMaxAge=' . $wgRCMaxAge );
                $days = $wgRCMaxAge / 24 / 3600;
                if ( intval( $days ) == $days ) {
@@ -62,7 +59,7 @@ class RebuildRecentchanges extends Maintenance {
                } else {
                                $this->output( " (approx. " .  intval( $days ) . " days)\n" );
                }
-       
+
                $cutoff = time() - $wgRCMaxAge;
                $dbw->insertSelect( 'recentchanges', array( 'page', 'revision' ),
                        array(
@@ -97,14 +94,14 @@ class RebuildRecentchanges extends Maintenance {
        private function rebuildRecentChangesTablePass2() {
                $dbw = wfGetDB( DB_MASTER );
                list ( $recentchanges, $revision ) = $dbw->tableNamesN( 'recentchanges', 'revision' );
-       
+
                $this->output( "Updating links and size differences...\n" );
-       
+
                # Fill in the rc_last_oldid field, which points to the previous edit
                $sql = "SELECT rc_cur_id,rc_this_oldid,rc_timestamp FROM $recentchanges " .
                  "ORDER BY rc_cur_id,rc_timestamp";
                $res = $dbw->query( $sql, DB_MASTER );
-       
+
                $lastCurId = 0;
                $lastOldId = 0;
                foreach ( $res as $obj ) {
@@ -118,35 +115,42 @@ class RebuildRecentchanges extends Maintenance {
                                        "AND rev_timestamp<'{$emit}' ORDER BY rev_timestamp DESC";
                                $sql2 = $dbw->limitResult( $sql2, 1, false );
                                $res2 = $dbw->query( $sql2 );
-                               if ( $row = $dbw->fetchObject( $res2 ) ) {
+                               $row = $dbw->fetchObject( $res2 );
+                               if ( $row ) {
                                        $lastOldId = intval( $row->rev_id );
                                        # Grab the last text size if available
-                                       $lastSize = !is_null( $row->rev_len ) ? intval( $row->rev_len ) : 'NULL';
+                                       $lastSize = !is_null( $row->rev_len ) ? intval( $row->rev_len ) : null;
                                } else {
                                        # No previous edit
                                        $lastOldId = 0;
-                                       $lastSize = 'NULL';
+                                       $lastSize = null;
                                        $new = 1; // probably true
                                }
-                               $dbw->freeResult( $res2 );
                        }
                        if ( $lastCurId == 0 ) {
                                $this->output( "Uhhh, something wrong? No curid\n" );
                        } else {
                                # Grab the entry's text size
                                $size = $dbw->selectField( 'revision', 'rev_len', array( 'rev_id' => $obj->rc_this_oldid ) );
-                               $size = !is_null( $size ) ? intval( $size ) : 'NULL';
-       
-                               $sql3 = "UPDATE $recentchanges SET rc_last_oldid=$lastOldId,rc_new=$new,rc_type=$new," .
-                                       "rc_old_len=$lastSize,rc_new_len=$size " .
-                                       "WHERE rc_cur_id={$lastCurId} AND rc_this_oldid={$obj->rc_this_oldid}";
-                               $dbw->query( $sql3 );
-       
+
+                               $dbw->update( 'recentchanges',
+                                       array(
+                                               'rc_last_oldid' => $lastOldId,
+                                               'rc_new'        => $new,
+                                               'rc_type'       => $new,
+                                               'rc_old_len'    => $lastSize,
+                                               'rc_new_len'    => $size,
+                                       ), array(
+                                               'rc_cur_id'     => $lastCurId,
+                                               'rc_this_oldid' => $obj->rc_this_oldid,
+                                       ),
+                                       __METHOD__
+                               );
+
                                $lastOldId = intval( $obj->rc_this_oldid );
                                $lastSize = $size;
                        }
                }
-               $dbw->freeResult( $res );
        }
 
        /**
@@ -155,20 +159,20 @@ class RebuildRecentchanges extends Maintenance {
         */
        private function rebuildRecentChangesTablePass3() {
                $dbw = wfGetDB( DB_MASTER );
-       
+
                $this->output( "Loading from user, page, and logging tables...\n" );
-       
+
                global $wgRCMaxAge, $wgLogTypes, $wgLogRestrictions;
                // Some logs don't go in RC. This should check for that
                $basicRCLogs = array_diff( $wgLogTypes, array_keys( $wgLogRestrictions ) );
-       
+
                // Escape...blah blah
                $selectLogs = array();
                foreach ( $basicRCLogs as $logtype ) {
                        $safetype = $dbw->strencode( $logtype );
                        $selectLogs[] = "'$safetype'";
                }
-       
+
                $cutoff = time() - $wgRCMaxAge;
                list( $logging, $page ) = $dbw->tableNamesN( 'logging', 'page' );
                $dbw->insertSelect( 'recentchanges', array( 'user', "$logging LEFT JOIN $page ON (log_namespace=page_namespace AND log_title=page_title)" ),
@@ -209,11 +213,11 @@ class RebuildRecentchanges extends Maintenance {
         */
        private function rebuildRecentChangesTablePass4() {
                global $wgGroupPermissions, $wgUseRCPatrol;
-       
+
                $dbw = wfGetDB( DB_MASTER );
-       
+
                list( $recentchanges, $usergroups, $user ) = $dbw->tableNamesN( 'recentchanges', 'user_groups', 'user' );
-       
+
                $botgroups = $autopatrolgroups = array();
                foreach ( $wgGroupPermissions as $group => $rights ) {
                        if ( isset( $rights['bot'] ) && $rights['bot'] ) {
@@ -227,14 +231,14 @@ class RebuildRecentchanges extends Maintenance {
                if ( !empty( $botgroups ) ) {
                        $botwhere = implode( ',', $botgroups );
                        $botusers = array();
-       
+
                        $this->output( "Flagging bot account edits...\n" );
-       
+
                        # Find all users that are bots
                        $sql = "SELECT DISTINCT user_name FROM $usergroups, $user " .
                                "WHERE ug_group IN($botwhere) AND user_id = ug_user";
                        $res = $dbw->query( $sql, DB_MASTER );
-       
+
                        foreach ( $res as $obj ) {
                                $botusers[] = $dbw->addQuotes( $obj->user_name );
                        }
@@ -251,18 +255,18 @@ class RebuildRecentchanges extends Maintenance {
                if ( !$wgMiserMode && !empty( $autopatrolgroups ) ) {
                        $patrolwhere = implode( ',', $autopatrolgroups );
                        $patrolusers = array();
-       
+
                        $this->output( "Flagging auto-patrolled edits...\n" );
-       
+
                        # Find all users in RC with autopatrol rights
                        $sql = "SELECT DISTINCT user_name FROM $usergroups, $user " .
                                "WHERE ug_group IN($patrolwhere) AND user_id = ug_user";
                        $res = $dbw->query( $sql, DB_MASTER );
-       
+
                        foreach ( $res as $obj ) {
                                $patrolusers[] = $dbw->addQuotes( $obj->user_name );
                        }
-       
+
                        # Fill in the rc_patrolled field
                        if ( !empty( $patrolusers ) ) {
                                $patrolwhere = implode( ',', $patrolusers );
@@ -271,8 +275,6 @@ class RebuildRecentchanges extends Maintenance {
                                $dbw->query( $sql2 );
                        }
                }
-       
-               $dbw->freeResult( $res );
        }
 
        /**
@@ -291,4 +293,4 @@ class RebuildRecentchanges extends Maintenance {
 }
 
 $maintClass = "RebuildRecentchanges";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );