Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 12:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into bug/6211-fix-contact-nets-all

Browse source
This commit is contained in:
Hypolite Petovan 2018-12-02 10:24:50 -05:00 • committed by GitHub
commit 924869ab5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
104 changed files with 903 additions and 956 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Content/Nav.php
View file

@ -58,7 +58,7 @@ class Nav
public static function build(App $a)
{
// Placeholder div for popup panel
$nav = '<div id="panel" style="display: none;"></div>' ;
$nav = '<div id="panel" style="display: none;"></div>';
$nav_info = self::getInfo($a);
@ -170,7 +170,7 @@ class Nav
// "Home" should also take you home from an authenticated remote profile connection
$homelink = Profile::getMyURL();
if (! $homelink) {
$homelink = ((x($_SESSION, 'visitor_home')) ? $_SESSION['visitor_home'] : '');
$homelink = defaults($_SESSION, 'visitor_home', '');
}
if (($a->module != 'home') && (! (local_user()))) {