summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-06-11 15:02:30 -0400
committerEvan Prodromou <evan@prodromou.name>2008-06-11 15:02:30 -0400
commit526a09531e183d9f2483cb1d1e2b0593c0f028a1 (patch)
tree67e422034118f4f229e0bbb2d068e579b1b7501c /lib
parentf745c55622949ea05218695465374b6d78582b31 (diff)
change default avatars from config vars to theme files
darcs-hash:20080611190230-84dde-78ff0d6f6c370a33aabc4f0053651b6629f85499.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/common.php7
-rw-r--r--lib/util.php4
2 files changed, 2 insertions, 9 deletions
diff --git a/lib/common.php b/lib/common.php
index 198c8feaf..1077137ea 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -49,12 +49,7 @@ $config =
'license' =>
array('url' => 'http://creativecommons.org/licenses/by/3.0/',
'title' => 'Creative Commons Attribution 3.0',
- 'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'),
- 'avatar' =>
- array('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')));
+ 'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'));
$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
diff --git a/lib/util.php b/lib/util.php
index bbc411d81..5c55fcda9 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -456,9 +456,7 @@ function common_default_avatar($size) {
static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
AVATAR_STREAM_SIZE => 'stream',
AVATAR_MINI_SIZE => 'mini');
- global $config;
-
- return common_path($config['avatar']['default'][$sizenames[$size]]);
+ return theme_path('default-avatar-'.$sizenames[$size].'.png');
}
function common_local_url($action, $args=NULL) {