diff options
author | redmatrix <git@macgirvin.com> | 2016-03-30 22:13:24 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-03-30 22:13:24 -0700 |
commit | 1cd3b4182595b838a535dd6b6990251db05d49e6 (patch) | |
tree | 2d22ab3140caf9d7efcd46a1f30f81a833ebf6fd /include/security.php | |
parent | 4148211086ff53dfb6fb4e969fd067389bcfef29 (diff) | |
download | volse-hubzilla-1cd3b4182595b838a535dd6b6990251db05d49e6.tar.gz volse-hubzilla-1cd3b4182595b838a535dd6b6990251db05d49e6.tar.bz2 volse-hubzilla-1cd3b4182595b838a535dd6b6990251db05d49e6.zip |
deprecate $a->get_baseurl()
Diffstat (limited to 'include/security.php')
-rw-r--r-- | include/security.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/security.php b/include/security.php index f3cf2d1b6..3b91808d5 100644 --- a/include/security.php +++ b/include/security.php @@ -68,7 +68,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive $return_url = ''; unset($_SESSION['login_return_url']); - goaway($a->get_baseurl() . '/' . $return_url); + goaway(z_root() . '/' . $return_url); } /* This account has never created a channel. Send them to new_channel by default */ @@ -127,7 +127,7 @@ function change_channel($change_channel) { ); if($x) { $_SESSION['my_url'] = $x[0]['xchan_url']; - $_SESSION['my_address'] = $r[0]['channel_address'] . '@' . substr(get_app()->get_baseurl(), strpos(get_app()->get_baseurl(), '://') + 3); + $_SESSION['my_address'] = $r[0]['channel_address'] . '@' . substr(z_root(), strpos(z_root(), '://') + 3); get_app()->set_observer($x[0]); get_app()->set_perms(get_all_perms(local_channel(), $hash)); @@ -393,7 +393,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '', logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename); logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA); notice( check_form_security_std_err_msg() ); - goaway($a->get_baseurl() . $err_redirect ); + goaway(z_root() . $err_redirect ); } } function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') { |