summaryrefslogtreecommitdiff
path: root/classes/handler
diff options
context:
space:
mode:
authorfox <[email protected]>2022-11-28 20:43:10 +0300
committerfox <[email protected]>2022-11-28 20:43:10 +0300
commit292ca86665d13582028d32d6d40bbb6f4d8f5cc1 (patch)
treec72fb6a3261681ec854a61340338fc01b44fdfe0 /classes/handler
parent94c49399cc10c1f7001e8c76db7575b70e1fc674 (diff)
parenta355221e7f650b151fe866174152d686c1c2d146 (diff)
Merge pull request 'Consistently get the self URL.' (#92) from wn/tt-rss:bugfix/config-self-url-consistency into master
Reviewed-on: https://dev.tt-rss.org/tt-rss/tt-rss/pulls/92
Diffstat (limited to 'classes/handler')
-rwxr-xr-xclasses/handler/public.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 484f92507..b848b15fe 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -418,7 +418,7 @@ class Handler_Public extends Handler {
$return = clean($_REQUEST['return']);
- if ($_REQUEST['return'] && mb_strpos($return, Config::get(Config::SELF_URL_PATH)) === 0) {
+ if ($_REQUEST['return'] && mb_strpos($return, Config::get_self_url()) === 0) {
header("Location: " . clean($_REQUEST['return']));
} else {
header("Location: " . Config::get_self_url());
@@ -572,7 +572,7 @@ class Handler_Public extends Handler {
$tpl->setVariable('LOGIN', $login);
$tpl->setVariable('RESETPASS_LINK', $resetpass_link);
- $tpl->setVariable('TTRSS_HOST', Config::get(Config::SELF_URL_PATH));
+ $tpl->setVariable('TTRSS_HOST', Config::get_self_url());
$tpl->addBlock('message');