User.php.patch.txt
Public
Actions

Authored By

	• bzimport
	Nov 21 2014, 7:03 PM

Size

820 B

Referenced Files

None

Subscribers

None

User.php.patch.txt
View Options

	Index: User.php
	===================================================================
	RCS file: /cvsroot/wikipedia/phase3/includes/User.php,v
	retrieving revision 1.182
	diff -u -r1.182 User.php
	--- User.php 5 Sep 2005 02:22:20 -0000 1.182
	+++ User.php 8 Oct 2005 14:24:06 -0000
	@@ -1447,6 +1447,13 @@
	# Check if this IP address is already blocked
	$ipblock = Block::newFromDB( wfGetIP() );
	if ( $ipblock->isValid() ) {
	+ # If the user is already blocked. Then check if the autoblock would
	+ # excede the user block. If it would excede, then do nothing, else
	+ # prolong block time
	+ if ($userblock->mExpiry &&
	+ ($userblock->mExpiry < Block::getAutoblockExpiry($ipblock->mTimestamp))) {
	+ return;
	+ }
	# Just update the timestamp
	$ipblock->updateTimestamp();
	return;