[feature/oauth] Forgot to have login_link be "in login" in ucp

PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-08-05 15:38:58 -04:00
parent baa3a750c4
commit 4683c37682
3 changed files with 37 additions and 2 deletions

View file

@ -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()
{
}
}

View file

@ -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_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_AIM' => 'AOL Instant Messenger',
'UCP_ATTACHMENTS' => 'Attachments', '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_BEFORE' => 'Before %s',
'UCP_COPPA_ON_AFTER' => 'On or after %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.', '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.',

View file

@ -21,7 +21,7 @@ require($phpbb_root_path . 'includes/functions_module.' . $phpEx);
$id = request_var('i', ''); $id = request_var('i', '');
$mode = request_var('mode', ''); $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); define('IN_LOGIN', true);
} }