diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-06-14 21:11:15 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-06-14 21:11:15 +0530 |
| commit | 86c3fd34dd409ead6ef1b9c76ccec422960aaa5e (patch) | |
| tree | 8af73cc65cf2d7117fcabb9876ab95f2f1d92ad9 | |
| parent | b64837a29bbb6563b1a2f4c4112bd893c24ff0bf (diff) | |
| parent | a6e9da5a7ca7ec61a60eee223b3d8be2b13b61fd (diff) | |
| download | forums-86c3fd34dd409ead6ef1b9c76ccec422960aaa5e.tar forums-86c3fd34dd409ead6ef1b9c76ccec422960aaa5e.tar.gz forums-86c3fd34dd409ead6ef1b9c76ccec422960aaa5e.tar.bz2 forums-86c3fd34dd409ead6ef1b9c76ccec422960aaa5e.tar.xz forums-86c3fd34dd409ead6ef1b9c76ccec422960aaa5e.zip | |
Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
[ticket/12209] Notify the admin that OAuth still allows DB authentification
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 8ab7be2abd..638e9907ac 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -414,7 +414,7 @@ $lang = array_merge($lang, array( 'AUTH_METHOD' => 'Select an authentication method', 'AUTH_PROVIDER_OAUTH_ERROR_ELEMENT_MISSING' => 'Both the key and secret of each enabled OAuth service provider must be provided. Only one was provided for an OAuth service provider.', - 'AUTH_PROVIDER_OAUTH_EXPLAIN' => 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server.<br />These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users.', + 'AUTH_PROVIDER_OAUTH_EXPLAIN' => 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server. These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users. Also note, that user can still register and login using the DB authentication plug-in.', 'AUTH_PROVIDER_OAUTH_KEY' => 'Key', 'AUTH_PROVIDER_OAUTH_TITLE' => 'OAuth', 'AUTH_PROVIDER_OAUTH_SECRET' => 'Secret', |