diff options
| author | Evan Prodromou <evan@prodromou.name> | 2008-05-21 11:54:48 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@prodromou.name> | 2008-05-21 11:54:48 -0400 |
| commit | 9933e1e341593b90fab6d366706710d604a1b43f (patch) | |
| tree | a55deb6c419a92b271b1b3877e1a36328c023818 /lib | |
| parent | 12a58d87e859cc83ebfbf3dfec96931f4387f2f5 (diff) | |
fixup default avatar urls by using common function
darcs-hash:20080521155448-84dde-0e71fe5dccea49162911f80c65cd1e2a46043b14.gz
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.php | 12 | ||||
| -rw-r--r-- | lib/stream.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 8 |
3 files changed, 14 insertions, 8 deletions
diff --git a/lib/common.php b/lib/common.php index c6bc97d82..50d0110e2 100644 --- a/lib/common.php +++ b/lib/common.php @@ -45,13 +45,11 @@ $config = 'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'), 'avatar' => array('directory' => INSTALLDIR . '/avatar', - 'path' => '/avatar')); - -# these depend on defaults above -$config['avatar']['default'] = - array('profile' => "http://".$config['site']['server'].$config['site']['path'].'/'.'theme/default/image/default-avatar-profile.png', - 'stream' => "http://".$config['site']['server'].$config['site']['path'].'/'.'theme/default/image/default-avatar-stream.png', - 'mini' => "http://".$config['site']['server'].$config['site']['path'].'/'.'theme/default/image/default-avatar-mini.png'); + 'path' => '/avatar', + 'default' => + array('profile' => 'theme/default/image/default-avatar-profile.png', + 'stream' => 'theme/default/image/default-avatar-stream.png', + 'mini' => 'theme/default/image/default-avatar-mini.png'))); $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options'); diff --git a/lib/stream.php b/lib/stream.php index a9c01095e..4b7d6ed24 100644 --- a/lib/stream.php +++ b/lib/stream.php @@ -35,7 +35,7 @@ class StreamAction extends Action { 'id' => 'notice-' . $notice->id)); $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); common_element_start('a', array('href' => $profile->profileurl)); - common_element('img', array('src' => ($avatar) ? $avatar->url : $config['avatar']['default']['stream'], + common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE), 'class' => 'avatar stream', 'width' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE, diff --git a/lib/util.php b/lib/util.php index 9635c1abb..09c4705a7 100644 --- a/lib/util.php +++ b/lib/util.php @@ -368,6 +368,14 @@ function common_avatar_url($filename) { return "http://".$config['site']['server'].$config['avatar']['path'].'/'.$filename; } +function common_default_avatar($size) { + static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile', + AVATAR_STREAM_SIZE => 'stream', + AVATAR_MINI_SIZE => 'mini'); + global $config; + return "http://".$config['site']['server'].$config['avatar']['path'].'/'.$config['avatar']['default'][$sizenames[$size]]; +} + function common_local_url($action, $args=NULL) { global $config; /* XXX: pretty URLs */ |