Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
a26b4e8af1
10 changed files with 36 additions and 14 deletions
4
boot.php
4
boot.php
|
@ -904,6 +904,10 @@ if(! function_exists('login')) {
|
|||
$tpl = get_markup_template("logout.tpl");
|
||||
}
|
||||
else {
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
|
||||
'$baseurl' => $a->get_baseurl(true)
|
||||
));
|
||||
|
||||
$tpl = get_markup_template("login.tpl");
|
||||
$_SESSION['return_url'] = $a->query_string;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue