summaryrefslogtreecommitdiff
path: root/classes/Avatar.php
diff options
context:
space:
mode:
authorJeffery To <jeffery.to@gmail.com>2009-06-24 01:25:55 +0800
committerJeffery To <jeffery.to@gmail.com>2009-06-24 01:25:55 +0800
commit280f8faab4f692ff7f4389f82397adfa6db56325 (patch)
tree94a076bfb3d13c7e6699e0149ee75fff6801880c /classes/Avatar.php
parentbb3361467c002e38aa3a424672f332b32a647e17 (diff)
parenteb40fbc17ad1efb0a4c51ee00b1e9408d2af382f (diff)
Merge branch '0.8.x' into small-fixes
Conflicts: lib/peoplesearchresults.php lib/profilelist.php
Diffstat (limited to 'classes/Avatar.php')
-rw-r--r--classes/Avatar.php30
1 files changed, 27 insertions, 3 deletions
diff --git a/classes/Avatar.php b/classes/Avatar.php
index db9d78e47..5e8b315fe 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -55,19 +55,43 @@ class Avatar extends Memcached_DataObject
static function path($filename)
{
- return INSTALLDIR . '/avatar/' . $filename;
+ $dir = common_config('avatar', 'dir');
+
+ if ($dir[strlen($dir)-1] != '/') {
+ $dir .= '/';
+ }
+
+ return $dir . $filename;
}
static function url($filename)
{
- return common_path('avatar/'.$filename);
+ $path = common_config('avatar', 'path');
+
+ if ($path[strlen($path)-1] != '/') {
+ $path .= '/';
+ }
+
+ if ($path[0] != '/') {
+ $path = '/'.$path;
+ }
+
+ $server = common_config('avatar', 'server');
+
+ if (empty($server)) {
+ $server = common_config('site', 'server');
+ }
+
+ // XXX: protocol
+
+ return 'http://'.$server.$path.$filename;
}
function displayUrl()
{
$server = common_config('avatar', 'server');
if ($server) {
- return 'http://'.$server.'/'.$this->filename;
+ return Avatar::url($this->filename);
} else {
return $this->url;
}