diff options
| author | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
| commit | 23678e344b4ddcad14254c106ecb93af174fdaa0 (patch) | |
| tree | a5c787e4d87313a7fb6f18cb4c78bf210d92d60c /lib/tpl/dokuwiki/tpl_header.php | |
| parent | 847cef0a6bfd2ff9dc54e1fc140f5ba0ece0017a (diff) | |
| parent | 5721a1547938df76003c6d91ea003dc1c70abd94 (diff) | |
| download | rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.gz rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/tpl/dokuwiki/tpl_header.php')
| -rw-r--r-- | lib/tpl/dokuwiki/tpl_header.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 0704aa271..19d165059 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -20,7 +20,7 @@ if (!defined('DOKU_INC')) die(); <h1><?php // get logo either out of the template images folder or data/media folder $logoSize = array(); - $logo = tpl_getMediaFile(array(':wiki:logo.png', 'images/logo.png'), false, $logoSize); + $logo = tpl_getMediaFile(array(':wiki:logo.png', ':logo.png', 'images/logo.png'), false, $logoSize); // display logo and wiki title in a link to the home page tpl_link( |