mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 00:35:30 +00:00
cleanup default icon logic
This commit is contained in:
parent
6b31b648eb
commit
642a1c2f2b
3 changed files with 9 additions and 10 deletions
|
@ -28,15 +28,11 @@ class System {
|
||||||
}
|
}
|
||||||
|
|
||||||
static public function get_project_icon() {
|
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';
|
return z_root() . '/images/zaplogo-64.png';
|
||||||
|
|
||||||
if(defined('NOMADIC')) {
|
|
||||||
return '⚡';
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return '☸';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
5
boot.php
5
boot.php
|
@ -1115,8 +1115,11 @@ class App {
|
||||||
self::$meta->set('generator', System::get_platform_name());
|
self::$meta->set('generator', System::get_platform_name());
|
||||||
|
|
||||||
$i = head_get_icon();
|
$i = head_get_icon();
|
||||||
|
if (! $i) {
|
||||||
|
$i = System::get_project_icon();
|
||||||
|
}
|
||||||
if($i) {
|
if($i) {
|
||||||
head_add_link(['rel' => 'shortcut icon', 'href' => head_get_icon()]);
|
head_add_link(['rel' => 'shortcut icon', 'href' => $i ]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$x = [ 'header' => '' ];
|
$x = [ 'header' => '' ];
|
||||||
|
|
|
@ -3467,10 +3467,10 @@ function array_path_exists($str,$arr) {
|
||||||
|
|
||||||
function get_forum_channels($uid,$collections = 0) {
|
function get_forum_channels($uid,$collections = 0) {
|
||||||
|
|
||||||
if(! $uid)
|
if (! $uid)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if($collections) {
|
if ($collections) {
|
||||||
$pagetype = $collections;
|
$pagetype = $collections;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Reference in a new issue