summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/showstream.php2
-rw-r--r--actions/subscribed.php2
-rw-r--r--actions/subscriptions.php2
-rw-r--r--lib/common.php12
-rw-r--r--lib/stream.php2
-rw-r--r--lib/util.php8
6 files changed, 17 insertions, 11 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index 25baf2fc9..69d9ecef9 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -174,7 +174,7 @@ class ShowstreamAction extends StreamAction {
'href' => $subs->profileurl,
'class' => 'subscription'));
$avatar = $subs->getAvatar(AVATAR_MINI_SIZE);
- common_element('img', array('src' => (($avatar) ? $avatar->url : $config['avatar']['default']['mini']),
+ common_element('img', array('src' => (($avatar) ? $avatar->url : common_default_avatar(AVATAR_MINI_SIZE),
'width' => AVATAR_MINI_SIZE,
'height' => AVATAR_MINI_SIZE,
'class' => 'avatar mini',
diff --git a/actions/subscribed.php b/actions/subscribed.php
index 659118fb9..3218e07b8 100644
--- a/actions/subscribed.php
+++ b/actions/subscribed.php
@@ -69,7 +69,7 @@ class SubscribedAction extends Action {
'href' => $subs->profileurl,
'class' => 'subscription'));
$avatar = $subs->getAvatar(AVATAR_STREAM_SIZE);
- 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)),
'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE,
'class' => 'avatar stream',
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index c15bd5310..f111d0be2 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -68,7 +68,7 @@ class SubscriptionsAction extends Action {
common_element('img',
array('src' =>
(($avatar) ? $avatar->url :
- $config['avatar']['default']['stream']),
+ common_default_avatar(AVATAR_STREAM_SIZE)),
'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE,
'class' => 'avatar stream',
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 */