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 c1ce092..c435071 100644 (file)
--- 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 c9a78dc..92e7d9a 100644 (file)
--- 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;