more rigorous check on site logo

darcs-hash:20080618153036-84dde-06329e00661924826d6fd2b5b0682957c21c06d9.gz

diff --git a/lib/util.php b/lib/util.php
index 0e3af013d51041903abfb555121594382dc8bf22..a953fa39a8af7b9d29a9b7031d0803a28ffeba11 100644 (file)
--- 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'),