From: Matt Johnston <mattj@users.mediawiki.org>
Date: Mon, 29 Sep 2008 23:16:34 +0000 (+0000)
Subject: Fix r41248 (bug 8440) - Default should be 1 to allow for previous behaviour to continue.
X-Git-Tag: 1.31.0-rc.0~45005
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=cf0521a6b0ac53cf4106edd496166436e9137701;p=lhc%2Fweb%2Fwiklou.git

Fix r41248 (bug 8440) - Default should be 1 to allow for previous behaviour to continue.
---

diff --git a/includes/User.php b/includes/User.php
index c1ce092552..c435071776 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1273,8 +1273,9 @@ class User {
 
 		wfDebug( __METHOD__.": asking isBlocked()\n" );
 		$blocked = $this->isBlocked( $bFromSlave );
+		$allowUsertalk = ($wgBlockAllowsUTEdit ? $this->mAllowUsertalk : false);
 		# If a user's name is suppressed, they cannot make edits anywhere
-		if ( !$this->mHideName && $this->mAllowUsertalk && $title->getText() === $this->getName() &&
+		if ( !$this->mHideName && $allowUsertalk && $title->getText() === $this->getName() &&
 		  $title->getNamespace() == NS_USER_TALK ) {
 			$blocked = false;
 			wfDebug( __METHOD__.": self-talk page, ignoring any blocks\n" );
diff --git a/maintenance/archives/patch-ipb_allow_usertalk.sql b/maintenance/archives/patch-ipb_allow_usertalk.sql
index c9a78dc974..92e7d9a442 100644
--- a/maintenance/archives/patch-ipb_allow_usertalk.sql
+++ b/maintenance/archives/patch-ipb_allow_usertalk.sql
@@ -1,3 +1,3 @@
 -- Adding ipb_allow_usertalk for blocks
 ALTER TABLE /*$wgDBprefix*/ipblocks
-  ADD ipb_allow_usertalk bool NOT NULL default 0;
+  ADD ipb_allow_usertalk bool NOT NULL default 1;