summaryrefslogtreecommitdiff
path: root/lib/exe
diff options
context:
space:
mode:
authorKlap-in <klapinklapin@gmail.com>2013-08-01 20:50:20 +0200
committerKlap-in <klapinklapin@gmail.com>2013-08-01 20:50:20 +0200
commitb8625d831ec75bbe83e9fc07f2e15f9fb3725ccf (patch)
treef10148e2ba020dfbca78818992a95025852c9cc1 /lib/exe
parentb1ffadaa6963bbf83e61917c31e04c04c421ce9e (diff)
parent9b136f13f2219fd6d292ab3064122bec0ec33d0d (diff)
downloadrpg-b8625d831ec75bbe83e9fc07f2e15f9fb3725ccf.tar.gz
rpg-b8625d831ec75bbe83e9fc07f2e15f9fb3725ccf.tar.bz2
Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
Diffstat (limited to 'lib/exe')
-rw-r--r--lib/exe/opensearch.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php
index 73939c347..98f5f52d5 100644
--- a/lib/exe/opensearch.php
+++ b/lib/exe/opensearch.php
@@ -21,7 +21,7 @@ if(file_exists(DOKU_INC.'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';
+ $ico = DOKU_URL.'lib/tpl/dokuwiki/images/favicon.ico';
}
// output