* (bug 14367) Failed block no longer adds phantom watchlist entry

^demon's patch from https://bugzilla.wikimedia.org/attachment.cgi?id=4945

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a9474a1..e30fa58 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -322,6 +322,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   not the main namespace page.
 * (bug 11659) Urldecode image names in galleries
 * (bug 14258, 14368) Fix for subpage renames in replication environments
+* (bug 14367) Failed block no longer adds phantom watchlist entry
 
 
 === API changes in 1.13 ===

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index d456035..903c116 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -355,10 +355,6 @@ class IPBlockForm {
                        $this->BlockCreateAccount, $this->BlockEnableAutoblock, $this->BlockHideName,
                        $this->BlockEmail);
 
-               if ( $this->BlockWatchUser ) { 
-                       $wgUser->addWatch ( Title::makeTitle( NS_USER, $this->BlockAddress ) );
-               }
-               
                if (wfRunHooks('BlockIp', array(&$block, &$wgUser))) {
 
                        if ( !$block->insert() ) {
@@ -367,6 +363,10 @@ class IPBlockForm {
 
                        wfRunHooks('BlockIpComplete', array($block, $wgUser));
 
+                       if ( $this->BlockWatchUser ) { 
+                               $wgUser->addWatch ( Title::makeTitle( NS_USER, $this->BlockAddress ) );
+                       }
+
                        # Prepare log parameters
                        $logParams = array();
                        $logParams[] = $expirestr;