change default avatars from config vars to theme files

darcs-hash:20080611190230-84dde-78ff0d6f6c370a33aabc4f0053651b6629f85499.gz

diff --git a/lib/common.php b/lib/common.php
index 198c8feaff23e0bdd76d1c6bad137a6fbe27feb7..1077137ea117cd2375e39b31e0570d19df612c7d 100644 (file)
--- 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 bbc411d81e4f881eb2f97f15e3ec7995d3fa3c84..5c55fcda989f74a65cf3edd9f2155625f52b91cd 100644 (file)
--- 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 (file)
index 0000000..38b8692
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 (file)
index 0000000..f8357d4
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 (file)
index 0000000..6b63baa
Binary files /dev/null and b/theme/stoica/default-avatar-stream.png differ