add a display url function to display URLs

darcs-hash:20080703170347-84dde-1ba2e178dd4051aa63e4073e472c73240e3d9fe8.gz

1 files changed, 9 insertions, 5 deletions

diff --git a/lib/util.php b/lib/util.php
index 7b821e635..4d1abe51a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -625,12 +625,16 @@ function common_avatar_path($filename) {
 }
 
 function common_avatar_url($filename) {
-    $server = common_config('avatar', 'server');
-    if ($server) {
-	return 'http://'.$server.'/'.$filename;
-    } else {
 	return common_path('avatar/'.$filename);
-    }
+}
+
+function common_avatar_display_url($avatar) {
+	$server = common_config('avatar', 'server');
+	if ($server) {
+		return 'http://'.$server.'/'.$avatar->filename;
+	} else {
+		return $avatar->url;
+	}
 }
 
 function common_default_avatar($size) {