diff options
| author | Guy Brand <gb@unistra.fr> | 2012-09-10 17:04:45 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2012-09-10 17:04:45 +0200 |
| commit | 0f8ac4e8c5872a6b68b350f96a9ecde0291edefa (patch) | |
| tree | ad7938bb4143d5e5a38fd7a8d131e4171aec657d /lib/exe/opensearch.php | |
| parent | 58ec8fa9128e4581749955de87530f432e387588 (diff) | |
| parent | b31fcef02fd24b3e746c9618e77152c7b84c2f2a (diff) | |
| download | rpg-0f8ac4e8c5872a6b68b350f96a9ecde0291edefa.tar.gz rpg-0f8ac4e8c5872a6b68b350f96a9ecde0291edefa.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/exe/opensearch.php')
| -rw-r--r-- | lib/exe/opensearch.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php index 03a1632c4..73939c347 100644 --- a/lib/exe/opensearch.php +++ b/lib/exe/opensearch.php @@ -16,9 +16,9 @@ require_once(DOKU_INC.'inc/init.php'); // try to be clever about the favicon location if(file_exists(DOKU_INC.'favicon.ico')){ $ico = DOKU_URL.'favicon.ico'; -}elseif(file_exists(DOKU_TPLINC.'images/favicon.ico')){ +}elseif(file_exists(tpl_incdir().'images/favicon.ico')){ $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico'; -}elseif(file_exists(DOKU_TPLINC.'favicon.ico')){ +}elseif(file_exists(tpl_incdir().'favicon.ico')){ $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico'; }else{ $ico = DOKU_URL.'lib/tpl/default/images/favicon.ico'; |