diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-08-05 15:38:58 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-08-05 17:35:44 -0400 |
| commit | 4683c37682541f73deca1f1476daf8c24f6962d6 (patch) | |
| tree | a818c7c71dc32cfb75b4425136cf50cc9d6d5c8f | |
| parent | baa3a750c4cd2112202c40b39d1f3fdf5b05bdb1 (diff) | |
| download | forums-4683c37682541f73deca1f1476daf8c24f6962d6.tar forums-4683c37682541f73deca1f1476daf8c24f6962d6.tar.gz forums-4683c37682541f73deca1f1476daf8c24f6962d6.tar.bz2 forums-4683c37682541f73deca1f1476daf8c24f6962d6.tar.xz forums-4683c37682541f73deca1f1476daf8c24f6962d6.zip | |
[feature/oauth] Forgot to have login_link be "in login" in ucp
PHPBB3-11673
| -rw-r--r-- | phpBB/includes/ucp/info/ucp_auth_link.php | 34 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 3 | ||||
| -rw-r--r-- | phpBB/ucp.php | 2 |
3 files changed, 37 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/info/ucp_auth_link.php b/phpBB/includes/ucp/info/ucp_auth_link.php new file mode 100644 index 0000000000..c5cd997af4 --- /dev/null +++ b/phpBB/includes/ucp/info/ucp_auth_link.php @@ -0,0 +1,34 @@ +<?php +/** +* +* @package ucp +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @package module_install +*/ +class ucp_auth_link_info +{ + function module() + { + return array( + 'filename' => 'ucp_auth_link', + 'title' => 'UCP_AUTH_LINK', + 'version' => '1.0.0', + 'modes' => array( + 'auth_link' => array('title' => 'UCP_AUTH_LINK_MANAGE', 'auth' => '', 'cat' => array('UCP_MAIN')), + ), + ); + } + + function install() + { + } + + function uninstall() + { + } +} diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index a25fb54c8c..993e5b56f8 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -479,7 +479,8 @@ $lang = array_merge($lang, array( 'UCP_ADMIN_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will receive an email at the address you specified.', 'UCP_AIM' => 'AOL Instant Messenger', 'UCP_ATTACHMENTS' => 'Attachments', - 'UCP_AUTH_LINK' => 'Link an external account', + 'UCP_AUTH_LINK' => 'External accounts', + 'UCP_AUTH_LINK_MANAGE' => 'Manage external accounts', 'UCP_COPPA_BEFORE' => 'Before %s', 'UCP_COPPA_ON_AFTER' => 'On or after %s', 'UCP_EMAIL_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.', diff --git a/phpBB/ucp.php b/phpBB/ucp.php index d69d938038..f1f8f2a829 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -21,7 +21,7 @@ require($phpbb_root_path . 'includes/functions_module.' . $phpEx); $id = request_var('i', ''); $mode = request_var('mode', ''); -if (in_array($mode, array('login', 'logout', 'confirm', 'sendpassword', 'activate'))) +if (in_array($mode, array('login', 'login_link', 'logout', 'confirm', 'sendpassword', 'activate'))) { define('IN_LOGIN', true); } |