X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FBlock.php;h=c6b948239c364035e5c5f98f96b22df381bcf403;hb=4d75fbf3571c765a3d84140cb77b45a86aab3184;hp=700e551eb961068b79d07c4ecaa409b40216a481;hpb=0fd9e748ccb066dc296c5ef4bda084528cc53f9d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Block.php b/includes/Block.php
index 700e551eb9..c6b948239c 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -964,9 +964,12 @@ class Block {
 
 	/**
 	 * Is the block address valid (i.e. not a null string?)
+	 *
+	 * @deprecated since 1.33 No longer needed in core.
 	 * @return bool
 	 */
 	public function isValid() {
+		wfDeprecated( __METHOD__, '1.33' );
 		return $this->getTarget() != null;
 	}
 
@@ -1294,7 +1297,7 @@ class Block {
 				// their own talk page unless a restriction exists on the
 				// page or User_talk: namespace
 				wfSetVar( $this->allowUsertalk, $x === null ? null : !$x );
-				$res = !$this->isUserTalkEditAllowed();
+				$res = !$this->isUsertalkEditAllowed();
 
 				// edit own user talk can be disabled by config
 				if ( !$blockAllowsUTEdit ) {
@@ -2143,7 +2146,7 @@ class Block {
 	 * Check if the block prevents a user from resetting their password
 	 *
 	 * @since 1.33
-	 * @return bool|null The block blocks password reset
+	 * @return bool The block blocks password reset
 	 */
 	public function appliesToPasswordReset() {
 		switch ( $this->getSystemBlockType() ) {
@@ -2156,7 +2159,7 @@ class Block {
 			case 'wgSoftBlockRanges':
 				return false;
 			default:
-				return false;
+				return true;
 		}
 	}