harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Mario Vavti
2017-02-02 09:38:07 +01:00
parent 2e0180ba55 23303391e0
commit c3bada3c32
16 changed files with 161 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nav.php
View File

@@ -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