The icon for the website is now changeable in the config

diff --git a/boot.php b/boot.php
index ee5943d61bbf230bd5429fb811a645f9036a1e2c..8b5cda68ab49dcccb9873c6d720cb46d934e039d 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -693,6 +693,14 @@ if(! class_exists('App')) {
                        else
                                $stylesheet = '$stylesheet';
 
+                       $shortcut_icon = get_config("system", "shortcut_icon");
+                       if ($shortcut_icon == "")
+                               $shortcut_icon = $this->get_baseurl()."/images/friendica-32.png";
+
+                       $touch_icon = get_config("system", "touch_icon");
+                       if ($touch_icon == "")
+                               $touch_icon = $this->get_baseurl()."/images/friendica-128.png";
+
                        $tpl = get_markup_template('head.tpl');
                        $this->page['htmlhead'] = replace_macros($tpl,array(
                                '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
@@ -703,6 +711,8 @@ if(! class_exists('App')) {
                                '$showmore' => t('show more'),
                                '$showfewer' => t('show fewer'),
                                '$update_interval' => $interval,
+                               '$shortcut_icon' => $shortcut_icon,
+                               '$touch_icon' => $touch_icon,
                                '$stylesheet' => $stylesheet
                        )) . $this->page['htmlhead'];
                }

diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index f1f6b550524a9ba8c4219a6aa29a3bfa6c18672c..d60d2603c1abacd1b3bd7fd652bafdc6015e7bfa 100644 (file)
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -13,9 +13,13 @@
 
 <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
 
+<!--
 <link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
-
 <link rel="apple-touch-icon" href="{{$baseurl}}/images/friendica-128.png"/>
+-->
+<link rel="shortcut icon" href="{{$shortcut_icon}}" />
+<link rel="apple-touch-icon" href="{{$touch_icon}}"/>
+
 <meta name="apple-mobile-web-app-capable" content="yes" />