From 526a09531e183d9f2483cb1d1e2b0593c0f028a1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 11 Jun 2008 15:02:30 -0400 Subject: change default avatars from config vars to theme files darcs-hash:20080611190230-84dde-78ff0d6f6c370a33aabc4f0053651b6629f85499.gz --- lib/common.php | 7 +------ lib/util.php | 4 +--- theme/stoica/default-avatar-mini.png | Bin 0 -> 646 bytes theme/stoica/default-avatar-profile.png | Bin 0 -> 2853 bytes theme/stoica/default-avatar-stream.png | Bin 0 -> 1487 bytes 5 files changed, 2 insertions(+), 9 deletions(-) create mode 100644 theme/stoica/default-avatar-mini.png create mode 100644 theme/stoica/default-avatar-profile.png create mode 100644 theme/stoica/default-avatar-stream.png 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) { diff --git a/theme/stoica/default-avatar-mini.png b/theme/stoica/default-avatar-mini.png new file mode 100644 index 000000000..38b8692b4 Binary files /dev/null and b/theme/stoica/default-avatar-mini.png differ diff --git a/theme/stoica/default-avatar-profile.png b/theme/stoica/default-avatar-profile.png new file mode 100644 index 000000000..f8357d4fc Binary files /dev/null and b/theme/stoica/default-avatar-profile.png differ diff --git a/theme/stoica/default-avatar-stream.png b/theme/stoica/default-avatar-stream.png new file mode 100644 index 000000000..6b63baa70 Binary files /dev/null and b/theme/stoica/default-avatar-stream.png differ -- cgit v1.2.3-54-g00ecf