aboutsummaryrefslogtreecommitdiffstats
path: root/include/nav.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-02-02 09:38:07 +0100
committerMario Vavti <mario@mariovavti.com>2017-02-02 09:38:07 +0100
commitc3bada3c329cac9b712e0d4d0c5fb0bb73f24d45 (patch)
treea13c2d56c1b14ba99a853fb7494a9214d075554d /include/nav.php
parent2e0180ba55e5cbefcfc4066a82dbcaa5b59cacc2 (diff)
parent23303391e070120851d505a2ec8f3b9b696329e2 (diff)
downloadvolse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.gz
volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.bz2
volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.zip
resolve merge conflict
Diffstat (limited to 'include/nav.php')
-rw-r--r--include/nav.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/nav.php b/include/nav.php
index 1adc352a7..894b30b45 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -112,7 +112,7 @@ EOT;
}
else {
if(! get_account_id()) {
- $nav['login'] = login();
+ $nav['login'] = login(true,'main-login',false,false);
$nav['loginmenu'][] = Array('login',t('Login'),'',t('Sign in'),'login_nav_btn');
}
else