summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-06-18 11:30:36 -0400
committerEvan Prodromou <evan@prodromou.name>2008-06-18 11:30:36 -0400
commit79ac3376959e6c22cfd6c6d053752be3d2bb8537 (patch)
treeeae9a6164429400b248cc6161f21efba60ca8960 /lib
parent2de52654e2b253d9d6bbe47746245d58e96be652 (diff)
more rigorous check on site logo
darcs-hash:20080618153036-84dde-06329e00661924826d6fd2b5b0682957c21c06d9.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index 0e3af013d..a953fa39a 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'),