From 79ac3376959e6c22cfd6c6d053752be3d2bb8537 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 18 Jun 2008 11:30:36 -0400 Subject: [PATCH] more rigorous check on site logo darcs-hash:20080618153036-84dde-06329e00661924826d6fd2b5b0682957c21c06d9.gz --- lib/util.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index 0e3af013d5..a953fa39a8 100644 --- a/lib/util.php +++ b/lib/util.php @@ -183,7 +183,9 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall= common_element_start('div', array('id' => 'wrap')); common_element_start('div', array('id' => 'header')); common_nav_menu(); - if ($config['site']['logo'] || file_exists(theme_file('logo.png'))) { + if ((is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0)) + || file_exists(theme_file('logo.png'))) + { common_element_start('a', array('href' => common_local_url('public'))); common_element('img', array('src' => ($config['site']['logo']) ? ($config['site']['logo']) : theme_path('logo.png'),