diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-06 17:16:13 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-06 17:16:13 -0700 |
commit | 99194e03fa50b61f99164674afc949b4bbefd44a (patch) | |
tree | 2d38f6ec4b1e6f314d925233c781315541772a0f /classes/Avatar.php | |
parent | 033a7570133d4183c2e162859e9b85fe7df3e40b (diff) | |
parent | 71176b9a98ef5298162f821c621a0e467dd9570b (diff) |
Merge branch '1.0.x' into schema-x
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
Diffstat (limited to 'classes/Avatar.php')
-rw-r--r-- | classes/Avatar.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/Avatar.php b/classes/Avatar.php index dbe2cd813..6edc81768 100644 --- a/classes/Avatar.php +++ b/classes/Avatar.php @@ -42,8 +42,9 @@ class Avatar extends Memcached_DataObject return Memcached_DataObject::pkeyGet('Avatar', $kv); } - // where should the avatar go for this user? - + /** + * Where should the avatar go for this user? + */ static function filename($id, $extension, $size=null, $extra=null) { if ($size) { |