diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-11-02 11:00:42 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-11-02 11:00:42 +0100 |
| commit | 252a2d7991b651ac271f71474cf4aa18ba23fe6b (patch) | |
| tree | eb906c31bd767615c46493c58a44dd8260325e23 /phpBB | |
| parent | e118b4f4c0dbca5912f11e0954fa422f36a58353 (diff) | |
| parent | 54b7b2320c33023a85f4b11ded778491d63b73bd (diff) | |
| download | forums-252a2d7991b651ac271f71474cf4aa18ba23fe6b.tar forums-252a2d7991b651ac271f71474cf4aa18ba23fe6b.tar.gz forums-252a2d7991b651ac271f71474cf4aa18ba23fe6b.tar.bz2 forums-252a2d7991b651ac271f71474cf4aa18ba23fe6b.tar.xz forums-252a2d7991b651ac271f71474cf4aa18ba23fe6b.zip | |
Merge remote-tracking branch 'Marc/ticket/11983' into develop
* Marc/ticket/11983:
[ticket/11983] Add missing argument to docblock in ucp_notifications
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_notifications.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index dd62b69342..5a896c31b0 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -162,6 +162,7 @@ class ucp_notifications /** * Output all the notification types to the template * + * @param array $subscriptions Array containing global subscriptions * @param \phpbb\notification\manager $phpbb_notifications * @param \phpbb\template\template $template * @param \phpbb\user $user |