summaryrefslogtreecommitdiff
path: root/includes/Block.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2009-06-10 13:00:47 +0200
committerPierre Schmitz <pierre@archlinux.de>2009-06-10 13:00:47 +0200
commit72e90545454c0e014318fa3c81658e035aac58c1 (patch)
tree9212e3f46868989c4d57ae9a5c8a1a80e4dc0702 /includes/Block.php
parent565a0ccc371ec1a2a0e9b39487cbac18e6f60e25 (diff)
applying patch to version 1.15.0
Diffstat (limited to 'includes/Block.php')
-rw-r--r--includes/Block.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/Block.php b/includes/Block.php
index 2c2227e2..a44941f1 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -105,6 +105,7 @@ class Block {
&& $this->mHideName == $block->mHideName
&& $this->mBlockEmail == $block->mBlockEmail
&& $this->mAllowUsertalk == $block->mAllowUsertalk
+ && $this->mReason == $block->mReason
);
}
@@ -570,7 +571,7 @@ class Block {
## Allow hooks to cancel the autoblock.
if (!wfRunHooks( 'AbortAutoblock', array( $autoblockIP, &$this ) )) {
- wfDebug( "Autoblock aborted by hook." );
+ wfDebug( "Autoblock aborted by hook.\n" );
return false;
}