From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 29 Mar 2012 23:31:39 +0000 (-0700)
Subject: Added user Id sanity check to setUsernameBitfields() for bug 34755.
X-Git-Tag: 1.31.0-rc.0~24094
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=2754304fefa69b9b4cb894e674aa199bf55e3003;p=lhc%2Fweb%2Fwiklou.git

Added user Id sanity check to setUsernameBitfields() for bug 34755.

Change-Id: I44288d199d86045151f8184f7abaa3df886d9d99
---

diff --git a/includes/revisiondelete/RevisionDeleteUser.php b/includes/revisiondelete/RevisionDeleteUser.php
index fe424efa30..0e965c8206 100644
--- a/includes/revisiondelete/RevisionDeleteUser.php
+++ b/includes/revisiondelete/RevisionDeleteUser.php
@@ -34,10 +34,10 @@ class RevisionDeleteUser {
 	 * @return bool
 	 */
 	private static function setUsernameBitfields( $name, $userId, $op, $dbw ) {
-		if( $op !== '|' && $op !== '&' ){
+		if ( !$userId || ( $op !== '|' && $op !== '&' ) ) {
 			return false; // sanity check
 		}
-		if( !$dbw instanceof DatabaseBase ){
+		if ( !$dbw instanceof DatabaseBase ) {
 			$dbw = wfGetDB( DB_MASTER );
 		}