From c95ec8d74e78599f26aaf70cc095bfcc29f49591 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sun, 7 Jan 2007 11:21:41 +0000 Subject: [PATCH] * ensure 'MediaWiki default' user is a bot when running batch deletion of mediawiki entries, so they don't clutter up RC * as paranoia, don't insert a groups record into the database if User::addGroup() ends up run on a non-existing user --- includes/User.php | 16 +++++++++------- maintenance/deleteDefaultMessages.php | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/includes/User.php b/includes/User.php index 44dada4ef6..18475fdd28 100644 --- a/includes/User.php +++ b/includes/User.php @@ -1575,13 +1575,15 @@ class User { function addGroup( $group ) { $this->load(); $dbw =& wfGetDB( DB_MASTER ); - $dbw->insert( 'user_groups', - array( - 'ug_user' => $this->getID(), - 'ug_group' => $group, - ), - 'User::addGroup', - array( 'IGNORE' ) ); + if( $this->getId() ) { + $dbw->insert( 'user_groups', + array( + 'ug_user' => $this->getID(), + 'ug_group' => $group, + ), + 'User::addGroup', + array( 'IGNORE' ) ); + } $this->mGroups[] = $group; $this->mRights = User::getGroupPermissions( $this->getEffectiveGroups( true ) ); diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php index fdad54ca29..7692400218 100644 --- a/maintenance/deleteDefaultMessages.php +++ b/maintenance/deleteDefaultMessages.php @@ -16,6 +16,8 @@ function deleteDefaultMessages() { global $wgUser; $wgUser = User::newFromName( $user ); + $wgUser->addGroup( 'bot' ); + $dbr =& wfGetDB( DB_SLAVE ); $res = $dbr->select( array( 'page', 'revision' ), array( 'page_namespace', 'page_title' ), -- 2.20.1