Merge "Use the same object when checking if the user is blocked instead of creating...

author Demon <chadh@wikimedia.org>

Fri, 4 May 2012 14:09:05 +0000 (14:09 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 4 May 2012 14:09:05 +0000 (14:09 +0000)
author Demon <chadh@wikimedia.org>
Fri, 4 May 2012 14:09:05 +0000 (14:09 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 4 May 2012 14:09:05 +0000 (14:09 +0000)
diff --cc includes/Block.php
Simple merge
diff --cc includes/User.php
Simple merge
author	Demon <chadh@wikimedia.org>
	Fri, 4 May 2012 14:09:05 +0000 (14:09 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 4 May 2012 14:09:05 +0000 (14:09 +0000)
		1	2
includes/Block.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history