diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-06-17 10:07:03 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-06-17 10:07:03 +0200 |
| commit | 5de54906f01466159fc956f583de431ae6bfabed (patch) | |
| tree | 1b39f391894372b297138b4e8377ac0c19736bd1 /phpBB | |
| parent | 8f3f7d1e5e2342941435cd75bb8c43fd66505360 (diff) | |
| parent | cfd4aab7b749e95fa649ee5f6e780c8412b43000 (diff) | |
| download | forums-5de54906f01466159fc956f583de431ae6bfabed.tar forums-5de54906f01466159fc956f583de431ae6bfabed.tar.gz forums-5de54906f01466159fc956f583de431ae6bfabed.tar.bz2 forums-5de54906f01466159fc956f583de431ae6bfabed.tar.xz forums-5de54906f01466159fc956f583de431ae6bfabed.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 7 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/provider_interface.php | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 4f0d40031d..f44bcc6fb7 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -181,10 +181,9 @@ class messenger /** * Adds X-AntiAbuse headers * - * @param array $config Configuration array - * @param user $user A user object - * - * @return null + * @param \phpbb\config\config $config Config object + * @param \phpbb\user $user User object + * @return void */ function anti_abuse_headers($config, $user) { diff --git a/phpBB/phpbb/auth/provider/provider_interface.php b/phpBB/phpbb/auth/provider/provider_interface.php index 35e0f559a1..463324ff46 100644 --- a/phpBB/phpbb/auth/provider/provider_interface.php +++ b/phpBB/phpbb/auth/provider/provider_interface.php @@ -71,9 +71,10 @@ interface provider_interface * options with whatever configuraton values are passed to it as an array. * It then returns the name of the acp file related to this authentication * provider. - * @param array $new_config Contains the new configuration values that - * have been set in acp_board. - * @return array|null Returns null if not implemented or an array with + * + * @param \phpbb\config\config $new_config Contains the new configuration values + * that have been set in acp_board. + * @return array|null Returns null if not implemented or an array with * the template file name and an array of the vars * that the template needs that must conform to the * following example: |