diff options
| -rw-r--r-- | engine/classes/ElggSite.php | 2 | ||||
| -rw-r--r-- | engine/lib/users.php | 2 | ||||
| -rw-r--r-- | pages/account/forgotten_password.php (renamed from account/forgotten_password.php) | 2 | ||||
| -rw-r--r-- | pages/account/register.php (renamed from account/register.php) | 2 | ||||
| -rw-r--r-- | views/default/account/forms/login.php | 2 | ||||
| -rw-r--r-- | views/default/account/forms/login_dropdown.php | 2 | ||||
| -rw-r--r-- | views/default/account/forms/login_walled_garden.php | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index 08d47ade5..e71f3ca25 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -332,7 +332,7 @@ class ElggSite extends ElggEntity { 'action/login', 'pg/register', 'action/register', - 'account/forgotten_password\.php', + 'pages/account/forgotten_password\.php', 'action/user/requestnewpassword', 'pg/resetpassword', 'upgrade\.php', diff --git a/engine/lib/users.php b/engine/lib/users.php index c82db2046..5c2ac7731 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1184,7 +1184,7 @@ function dashboard_page_handler($page_elements) { * Page handler for registration */ function registration_page_handler($page_elements) { - require_once(dirname(dirname(dirname(__FILE__))) . "/account/register.php"); + require_once(dirname(dirname(dirname(__FILE__))) . "/pages/account/register.php"); } /** diff --git a/account/forgotten_password.php b/pages/account/forgotten_password.php index 827b254c9..2285e7299 100644 --- a/account/forgotten_password.php +++ b/pages/account/forgotten_password.php @@ -6,7 +6,7 @@ * @subpackage Registration */ -require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); +require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); if (!isloggedin()) { $area1 = elgg_view_title(elgg_echo("user:password:lost")); diff --git a/account/register.php b/pages/account/register.php index 5709ee6d8..cbbc40060 100644 --- a/account/register.php +++ b/pages/account/register.php @@ -20,7 +20,7 @@ * BUT, there _might_ exist direct calls to this file, requiring the engine * to be started. Logic for both cases follow. */ -require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); +require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); global $CONFIG; // check new registration allowed diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php index 594c645de..5e6b5c8fe 100644 --- a/views/default/account/forms/login.php +++ b/views/default/account/forms/login.php @@ -20,7 +20,7 @@ $form_body .= elgg_view('login/extend'); $form_body .= "<p class='loginbox'>"; $form_body .= $CONFIG->allow_registration ? "<a href=\"{$vars['url']}pg/register/\">" . elgg_echo('register') . '</a> | ' : ''; -$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>"; +$form_body .= "<a href=\"{$vars['url']}pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>"; $login_url = $vars['url']; if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { diff --git a/views/default/account/forms/login_dropdown.php b/views/default/account/forms/login_dropdown.php index 5e5afd520..43cb248fa 100644 --- a/views/default/account/forms/login_dropdown.php +++ b/views/default/account/forms/login_dropdown.php @@ -13,7 +13,7 @@ if (!isloggedin()) { $form_body .= "<p class='loginbox'>"; $form_body .= $CONFIG->allow_registration ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . '</a> | ' : ''; - $form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>"; + $form_body .= "<a href=\"{$vars['url']}pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>"; $form_body .= "<input type='hidden' name='returntoreferer' value='true' />"; $login_url = $vars['url']; diff --git a/views/default/account/forms/login_walled_garden.php b/views/default/account/forms/login_walled_garden.php index 56ea365bb..72af49359 100644 --- a/views/default/account/forms/login_walled_garden.php +++ b/views/default/account/forms/login_walled_garden.php @@ -16,7 +16,7 @@ $register = elgg_echo('register'); $lost_password = elgg_echo('user:password:lost'); $form_body .= '<p class="lost_password">'; $form_body .= $CONFIG->allow_registration ? "<a class=\"registration_link\" href=\"{$vars['url']}pg/register/\">$register</a> | " : ''; -$form_body .= "<a class='forgotten_password_link' href=\"{$login_url}account/forgotten_password.php\">$lost_password</a>"; +$form_body .= "<a class='forgotten_password_link' href=\"{$login_url}pages/account/forgotten_password.php\">$lost_password</a>"; $form_body .= '</p>'; $login_url = $vars['url']; |