[dokuwiki] [patch] fix opensearch icon search

  • From: Mike Frysinger <vapier@xxxxxxxxxx>
  • To: dokuwiki@xxxxxxxxxxxxx
  • Date: Tue, 5 Dec 2006 19:45:45 -0500

i was backporting the opensearch patch to the last release when i noticed it 
seems the favicon search code that was added has a minor bug in it ... the 
first if() does file_exists() while the other if else causes simply do 
elseif(string) ... attached patch corrects the behavior to do 
elseif(file_exists(string))
-mike
--- old-dokuwiki/lib/exe/opensearch.php 2006-12-05 19:44:30.000000000 -0500
+++ new-dokuwiki/lib/exe/opensearch.php 2006-12-05 19:44:30.000000000 -0500
@@ -16,9 +16,9 @@
 // try to be clever about the favicon location
 if(file_exists(DOKU_INC.'favicon.ico')){
     $ico = DOKU_URL.'favicon.ico';
-}elseif(DOKU_TPL.'images/favicon.ico'){
+}elseif(file_exists(DOKU_TPL.'images/favicon.ico')){
     $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico';
-}elseif(DOKU_TPL.'favicon.ico'){
+}elseif(file_exists(DOKU_TPL.'favicon.ico')){
     $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico';
 }else{
     $ico = DOKU_URL.'lib/tpl/default/images/favicon.ico';

Other related posts:

  • » [dokuwiki] [patch] fix opensearch icon search