X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fblock%2FDatabaseBlock.php;h=6007abdf41822a4bb5189aa0523f302ed7b4068e;hb=f9bb20657c6776a7543fbf33ead1c1e6fbad33de;hp=fbf9a073ca2d27fd739ae8253ee453571321dfe9;hpb=0dda44c8e7e54ab897447954d5c4174513ce7586;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/block/DatabaseBlock.php b/includes/block/DatabaseBlock.php
index fbf9a073ca..6007abdf41 100644
--- a/includes/block/DatabaseBlock.php
+++ b/includes/block/DatabaseBlock.php
@@ -53,10 +53,16 @@ use Wikimedia\Rdbms\IDatabase;
  * @since 1.34 Renamed from Block.
  */
 class DatabaseBlock extends AbstractBlock {
-	/** @var bool */
+	/**
+	 * @deprecated since 1.34. Use getType to check whether a block is autoblocking.
+	 * @var bool
+	 */
 	public $mAuto;
 
-	/** @var int */
+	/**
+	 * @deprecated since 1.34. Use getParentBlockId instead.
+	 * @var int
+	 */
 	public $mParentBlockId;
 
 	/** @var int */
@@ -80,19 +86,18 @@ class DatabaseBlock extends AbstractBlock {
 	/**
 	 * Create a new block with specified option parameters on a user, IP or IP range.
 	 *
-	 * @param array $options Parameters of the block:
-	 *     user int             Override target user ID (for foreign users)
-	 *     auto bool            Is this an automatic block?
-	 *     expiry string        Timestamp of expiration of the block or 'infinity'
-	 *     anonOnly bool        Only disallow anonymous actions
-	 *     createAccount bool   Disallow creation of new accounts
-	 *     enableAutoblock bool Enable automatic blocking
-	 *     hideName bool        Hide the target user name
-	 *     blockEmail bool      Disallow sending emails
-	 *     allowUsertalk bool   Allow the target to edit its own talk page
-	 *     sitewide bool        Disallow editing all pages and all contribution
-	 *                          actions, except those specifically allowed by
-	 *                          other block flags
+	 * @param array $options Parameters of the block, with options supported by
+	 *  `AbstractBlock::__construct`, and also:
+	 *  - user: (int) Override target user ID (for foreign users)
+	 *  - auto: (bool) Is this an automatic block?
+	 *  - expiry: (string) Timestamp of expiration of the block or 'infinity'
+	 *  - anonOnly: (bool) Only disallow anonymous actions
+	 *  - createAccount: (bool) Disallow creation of new accounts
+	 *  - enableAutoblock: (bool) Enable automatic blocking
+	 *  - blockEmail: (bool) Disallow sending emails
+	 *  - allowUsertalk: (bool) Allow the target to edit its own talk page
+	 *  - sitewide: (bool) Disallow editing all pages and all contribution actions,
+	 *    except those specifically allowed by other block flags
 	 *
 	 * @since 1.26 $options array
 	 */
@@ -106,7 +111,6 @@ class DatabaseBlock extends AbstractBlock {
 			'anonOnly'        => false,
 			'createAccount'   => false,
 			'enableAutoblock' => false,
-			'hideName'        => false,
 			'blockEmail'      => false,
 			'allowUsertalk'   => false,
 			'sitewide'        => true,
@@ -123,7 +127,6 @@ class DatabaseBlock extends AbstractBlock {
 
 		# Boolean settings
 		$this->mAuto = (bool)$options['auto'];
-		$this->setHideName( (bool)$options['hideName'] );
 		$this->isHardblock( !$options['anonOnly'] );
 		$this->isAutoblocking( (bool)$options['enableAutoblock'] );
 		$this->isSitewide( (bool)$options['sitewide'] );