aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-06-17 10:07:03 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-06-17 10:07:03 +0200
commit5de54906f01466159fc956f583de431ae6bfabed (patch)
tree1b39f391894372b297138b4e8377ac0c19736bd1 /phpBB/phpbb
parent8f3f7d1e5e2342941435cd75bb8c43fd66505360 (diff)
parentcfd4aab7b749e95fa649ee5f6e780c8412b43000 (diff)
downloadforums-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/phpbb')
-rw-r--r--phpBB/phpbb/auth/provider/provider_interface.php7
1 files changed, 4 insertions, 3 deletions
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: