diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
| commit | 16a774a8a61756df2d8fb813bfbaed98b42e3e65 (patch) | |
| tree | 3a48d311e74ccbf4017330cef8af00003b0ddb34 /lib/tpl/default/main.php | |
| parent | 662a7b3fcc22d8327026bc1ef161a096683f1580 (diff) | |
| parent | a5a71ecfcc1ed6bfca1995b39cd0abe4b8dd9eeb (diff) | |
| download | rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.gz rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
doku.php
Diffstat (limited to 'lib/tpl/default/main.php')
| -rw-r--r-- | lib/tpl/default/main.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 94c2322aa..3e85c58f2 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -28,8 +28,7 @@ if (!defined('DOKU_INC')) die(); </title> <?php tpl_metaheaders()?> - - <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" /> + <?php echo tpl_favicon(array('favicon', 'mobile')) ?> <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?> </head> @@ -117,6 +116,7 @@ if (!defined('DOKU_INC')) die(); </div> <div class="bar-right" id="bar__bottomright"> <?php tpl_button('subscribe')?> + <?php tpl_button('media')?> <?php tpl_button('admin')?> <?php tpl_button('profile')?> <?php tpl_button('login')?> |