GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix use of $config in Action

This commit is contained in:
Evan Prodromou 2009-01-16 02:21:58 +00:00
parent d3092274c2
commit ba1e36dd49
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/action.php
View File

@ -222,15 +222,13 @@ class Action extends HTMLOutputter // lawsuit
'class' => 'vcard')); 'class' => 'vcard'));
$this->elementStart('a', array('class' => 'url home bookmark', $this->elementStart('a', array('class' => 'url home bookmark',
'href' => common_local_url('public'))); 'href' => common_local_url('public')));
if ((isset($config['site']['logo']) && is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0)) if (common_config('site', 'logo') || file_exists(theme_file('logo.png')))
|| file_exists(theme_file('logo.png')))
{ {
$this->element('img', array('class' => 'logo photo', $this->element('img', array('class' => 'logo photo',
'src' => isset($config['site']['logo']) ? 'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : theme_path('logo.png'),
($config['site']['logo']) : theme_path('logo.png'), 'alt' => common_config('site', 'name')));
'alt' => $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('a');
$this->elementEnd('address'); $this->elementEnd('address');
} }