From ba1e36dd492cedbad49f00715cf35a8cdf23ac07 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 16 Jan 2009 02:21:58 +0000 Subject: [PATCH] Fix use of $config in Action --- lib/action.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/action.php b/lib/action.php index 90bb678703..159621b7a5 100644 --- a/lib/action.php +++ b/lib/action.php @@ -222,15 +222,13 @@ class Action extends HTMLOutputter // lawsuit 'class' => 'vcard')); $this->elementStart('a', array('class' => 'url home bookmark', 'href' => common_local_url('public'))); - if ((isset($config['site']['logo']) && is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0)) - || file_exists(theme_file('logo.png'))) + if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) { $this->element('img', array('class' => 'logo photo', - 'src' => isset($config['site']['logo']) ? - ($config['site']['logo']) : theme_path('logo.png'), - 'alt' => $config['site']['name'])); + 'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : theme_path('logo.png'), + 'alt' => common_config('site', 'name'))); } - $this->element('span', array('class' => 'fn org'), $config['site']['name']); + $this->element('span', array('class' => 'fn org'), common_config('site', 'name')); $this->elementEnd('a'); $this->elementEnd('address'); } -- 2.39.5