summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-19 22:32:59 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-19 22:32:59 -0400
commite59cfea9bc75a551dab0bc19fcab9a6a9e119b4e (patch)
tree03afaff004c385634d9ec660fdd3d249e0e5dbbc
parent85d9cbe1659ddd5b0cad6ff5b15472653e1b85ff (diff)
Fix a couple of notice errors
darcs-hash:20080720023259-533db-6a4e8abb730b2192fcf2887a665dee2e1048529a.gz
-rw-r--r--lib/util.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/util.php b/lib/util.php
index c2c4f99db..ca8b53956 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -194,11 +194,11 @@ 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 ((is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
+ if ((isset($config['site']['logo']) && 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']) ?
+ common_element('img', array('src' => isset($config['site']['logo']) ?
($config['site']['logo']) : theme_path('logo.png'),
'alt' => $config['site']['name'],
'id' => 'logo'));
@@ -757,7 +757,7 @@ function common_fancy_url($action, $args=NULL) {
case 'subscribers':
case 'all':
case 'replies':
- if ($args && $args['page']) {
+ if ($args && isset($args['page'])) {
return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']);
} else {
return common_path($args['nickname'].'/'.$action);