| Index: trunk/phase3/includes/User.php |
| — | — | @@ -881,7 +881,8 @@ |
| 882 | 882 | wfProfileIn( __METHOD__ ); |
| 883 | 883 | wfDebug( __METHOD__.": checking...\n" ); |
| 884 | 884 | |
| 885 | | - $this->mBlockedby = 0; |
| | 885 | + $this->mBlockedby = 0; |
| | 886 | + $this->mHideName = 0; |
| 886 | 887 | $ip = wfGetIP(); |
| 887 | 888 | |
| 888 | 889 | if ($this->isAllowed( 'ipblock-exempt' ) ) { |
| — | — | @@ -896,6 +897,7 @@ |
| 897 | 898 | wfDebug( __METHOD__.": Found block.\n" ); |
| 898 | 899 | $this->mBlockedby = $this->mBlock->mBy; |
| 899 | 900 | $this->mBlockreason = $this->mBlock->mReason; |
| | 901 | + $this->mHideName = $this->mBlock->mHideName; |
| 900 | 902 | if ( $this->isLoggedIn() ) { |
| 901 | 903 | $this->spreadBlock(); |
| 902 | 904 | } |
| — | — | @@ -1074,14 +1076,13 @@ |
| 1075 | 1077 | wfProfileIn( __METHOD__ ); |
| 1076 | 1078 | wfDebug( __METHOD__.": enter\n" ); |
| 1077 | 1079 | |
| 1078 | | - if ( $wgBlockAllowsUTEdit && $title->getText() === $this->getName() && |
| 1079 | | - $title->getNamespace() == NS_USER_TALK ) |
| 1080 | | - { |
| | 1080 | + wfDebug( __METHOD__.": asking isBlocked()\n" ); |
| | 1081 | + $blocked = $this->isBlocked( $bFromSlave ); |
| | 1082 | + # If a user's name is suppressed, they cannot make edits anywhere |
| | 1083 | + if ( !$this->mHideName && $wgBlockAllowsUTEdit && $title->getText() === $this->getName() && |
| | 1084 | + $title->getNamespace() == NS_USER_TALK ) { |
| 1081 | 1085 | $blocked = false; |
| 1082 | 1086 | wfDebug( __METHOD__.": self-talk page, ignoring any blocks\n" ); |
| 1083 | | - } else { |
| 1084 | | - wfDebug( __METHOD__.": asking isBlocked()\n" ); |
| 1085 | | - $blocked = $this->isBlocked( $bFromSlave ); |
| 1086 | 1087 | } |
| 1087 | 1088 | wfProfileOut( __METHOD__ ); |
| 1088 | 1089 | return $blocked; |