Allow application-specific favicons

diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 96229fd370ae6da8356f153cec3f4424642a5d2f..aeebc2d6439789ce392ed65b31d33aa2ee9b1e9c 100644 (file)
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -13,8 +13,8 @@
                <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
                <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
                <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
-               <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
-               <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
+               <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" />
+               <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" />
                <?php foreach ($_['cssfiles'] as $cssfile): ?>
                        <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
                <?php endforeach; ?>

diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index c799205b7cf750a8057ebf1edf265f8280e6fdf3..c1a754472104ee4918e8e393aaa943af14217222 100644 (file)
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -14,8 +14,8 @@
                <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
                <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
                <meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
-               <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
-               <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
+               <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" />
+               <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" />
                <?php foreach($_['cssfiles'] as $cssfile): ?>
                        <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
                <?php endforeach; ?>

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 4ffec917c9b348b5c895307a6b1ad7e046631ae4..ffa5e557c645d0886574e5a272193fe4958efd7d 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -21,8 +21,8 @@
                <meta name="apple-mobile-web-app-status-bar-style" content="black">
                <meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:'ownCloud'); ?>">
                <meta name="mobile-web-app-capable" content="yes">
-               <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
-               <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
+               <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" />
+               <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" />
                <?php foreach($_['cssfiles'] as $cssfile): ?>
                        <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" />
                <?php endforeach; ?>