From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 20 Oct 2019 09:51:58 +0000 (+0000)
Subject: Merge "resources: Collapse all jQuery UI modules into one deprecated mega-module... 
X-Git-Tag: 1.34.0-rc.1~18
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=e2509cbd3077ef80de2d8e2a1217340b55c7039f;hp=7afced64454ad30d688540f7626448ac2faefebb;p=lhc%2Fweb%2Fwiklou.git

Merge "resources: Collapse all jQuery UI modules into one deprecated mega-module" into REL1_34
---

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 4261b0b0ef..a6d6c6c08e 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1730,6 +1730,9 @@ $context: IContextSource
 'GetUserBlock': Modify the block found by the block manager. This may be a
 single block or a composite block made from multiple blocks; the original
 blocks can be seen using CompositeBlock::getOriginalBlocks()
+$user: User targeted by the block
+$ip: string|null The IP of the current request if $user is the current user
+  and they're not exempted from IP blocks. Null otherwise.
 &$block: AbstractBlock object
 
 'getUserPermissionsErrors': Add a permissions error when permissions errors are