diff --git a/include/nav.php b/include/nav.php index dd2655e84a..77cffc3ab1 100644 --- a/include/nav.php +++ b/include/nav.php @@ -1,8 +1,5 @@ page,'nav')) - $a->page['nav'] = ''; - $a->page['nav'] .= '
' ; if(local_user()) { @@ -56,7 +53,9 @@ $banner = get_config('system','banner'); + if($banner === false) $banner .= 'Friendika'; + $a->page['nav'] .= ' '; diff --git a/index.php b/index.php index f2c43a8b3d..e91603a30a 100644 --- a/index.php +++ b/index.php @@ -120,6 +120,9 @@ else * "module"_afterpost * "module"_content - the string return of this function contains our page body * + * Modules which emit other serialisations besides HTML (XML,JSON, etc.) should do + * so within the module init and/or post functions and then invoke killme() to terminate + * further processing. */ if(strlen($a->module)) { @@ -193,7 +196,7 @@ $a->page['content'] .= ''; */ if($a->module != 'install') - require_once("nav.php"); + require_once('nav.php'); /** * diff --git a/mod/home.php b/mod/home.php index b8f16158eb..59cc31d3b0 100644 --- a/mod/home.php +++ b/mod/home.php @@ -14,12 +14,14 @@ if(! function_exists('home_content')) { function home_content(&$a) { $o = ''; - if(! (x($a->page,'footer'))) - $a->page['footer'] = ''; - $a->page['footer'] .= "