From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 8 Jan 2019 18:48:56 +0000 (+0000)
Subject: Merge "Fix tag for partial blocks config"
X-Git-Tag: 1.34.0-rc.0~3120
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_user_edit%27%2C%20iduser=user.userid%29%20%7D%7D?a=commitdiff_plain;h=8a2be2c599d6361cee2f93219cb4b8f03d2c8189;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix tag for partial blocks config"
---

8a2be2c599d6361cee2f93219cb4b8f03d2c8189
diff --combined includes/DefaultSettings.php
index 9a42419d86,77d91488a5..9df4ab67f0
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -4454,20 -4454,13 +4454,20 @@@ $wgCentralIdLookupProvider = 'local'
   * Password policy for the wiki.
   * Structured as
   * [
 - *     'policies' => [ <group> => [ <policy> => <value>, ... ], ... ],
 + *     'policies' => [ <group> => [ <policy> => <settings>, ... ], ... ],
   *     'checks' => [ <policy> => <callback>, ... ],
   * ]
   * where <group> is a user group, <policy> is a password policy name
   * (arbitrary string) defined in the 'checks' part, <callback> is the
 - * PHP callable implementing the policy check, <value> is a number,
 - * boolean or null that gets passed to the callback.
 + * PHP callable implementing the policy check, <settings> is an array
 + * of options with the following keys:
 + * - value: (number, boolean or null) the value to pass to the callback
 + * - forceChange: (bool, default false) if the password is invalid, do
 + *   not let the user log in without changing the password
 + * As a shorthand for [ 'value' => <value> ], simply <value> can be written.
 + * When multiple password policies are defined for a user, the settings
 + * arrays are merged, and for fields which are set in both arrays, the
 + * larger value (as understood by PHP's 'max' method) is taken.
   *
   * A user's effective policy is the superset of all policy statements
   * from the policies for the groups where the user is a member. If more
@@@ -9020,8 -9013,8 +9020,8 @@@ $wgActorTableSchemaMigrationStage = SCH
   * Flag to enable Partial Blocks. This allows an admin to prevent a user from editing specific pages
   * or namespaces.
   *
-  * @since 1.32
-  * @deprecated 1.32
+  * @since 1.33
+  * @deprecated 1.33
   * @var bool
   */
  $wgEnablePartialBlocks = false;