From 9cd1dabe73f7bd01473848f55cb4595494837ac9 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 28 Aug 2012 03:02:45 -0700 Subject: have to do something about that return_url - but let's just plunge forward without it. --- include/security.php | 4 ++-- mod/ping.php | 2 +- view/tpl/nav.tpl | 24 +++++++++++++----------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/include/security.php b/include/security.php index bb75e7af1..5302639d4 100644 --- a/include/security.php +++ b/include/security.php @@ -137,8 +137,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive } - - if(($a->module !== 'home') && isset($_SESSION['return_url'])) { +unset($_SESSION['return_url']); + if(($a->module !== 'home') && isset($_SESSION['return_url']) && strlen($_SESSION['return_url'])) { $return_url = $_SESSION['return_url']; unset($_SESSION['return_url']); goaway($a->get_baseurl() . '/' . $return_url); diff --git a/mod/ping.php b/mod/ping.php index 2d52e9731..cf4b65c90 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -47,7 +47,7 @@ function ping_init(&$a) { killme(); } - if($a->argc > 1 && $a->argv[1] === 'notify') { + if($argc() > 1 && $argv(1) === 'notify') { $t = q("select count(*) as total from notify where uid = %d and seen = 0", intval(local_user()) ); diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index af1fc9414..bd0fc2f5a 100644 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -39,17 +39,19 @@ {{ endif }} - {{ if $nav.notifications }} - - {{ endif }} - + + {{ if $nav.notifications }} + + + {{ endif }} +