cleanup default icon logic

This commit is contained in:
zotlabs 2019-05-05 21:06:02 -07:00
parent 6b31b648eb
commit 642a1c2f2b
3 changed files with 9 additions and 10 deletions

View file

@ -28,15 +28,11 @@ class System {
}
static public function get_project_icon() {
if(is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('icon',App::$config['system'])) {
return App::$config['system']['icon'];
}
return z_root() . '/images/zaplogo-64.png';
if(defined('NOMADIC')) {
return '⚡';
}
else {
return '☸';
}
}

View file

@ -1115,8 +1115,11 @@ class App {
self::$meta->set('generator', System::get_platform_name());
$i = head_get_icon();
if (! $i) {
$i = System::get_project_icon();
}
if($i) {
head_add_link(['rel' => 'shortcut icon', 'href' => head_get_icon()]);
head_add_link(['rel' => 'shortcut icon', 'href' => $i ]);
}
$x = [ 'header' => '' ];

View file

@ -3467,10 +3467,10 @@ function array_path_exists($str,$arr) {
function get_forum_channels($uid,$collections = 0) {
if(! $uid)
if (! $uid)
return;
if($collections) {
if ($collections) {
$pagetype = $collections;
}
else {