diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-02-12 13:19:07 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-02-12 13:19:07 +0100 |
| commit | c751ba04091195d499c0221fa7df38a85257eeca (patch) | |
| tree | 8567bd32f13be19ae02cd820e6f178dd63f0d323 | |
| parent | 4142267a02f27dd4db592e5d89fce104e908e0c4 (diff) | |
| parent | 27b35500a72f1ef4185b6df8742903fddec39442 (diff) | |
| download | nextcloud-server-c751ba04091195d499c0221fa7df38a85257eeca.tar.gz nextcloud-server-c751ba04091195d499c0221fa7df38a85257eeca.zip | |
Merge pull request #14121 from Zillode/app-favicon
Disable application-specific favicons for non-user pages
| -rw-r--r-- | core/templates/layout.base.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index aeebc2d6439..96229fd370a 100644 --- 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($_['appid'], 'favicon.png')); ?>" /> - <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" /> + <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')); ?>" /> <?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 c1a75447210..c799205b7cf 100644 --- 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($_['appid'], 'favicon.png')); ?>" /> - <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" /> + <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')); ?>" /> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" /> <?php endforeach; ?> |