add timestamp to avatar filenames to prevent overlap

darcs-hash:20080528140321-84dde-2dbeb6032e845a23bb1adde1cbc1788333b55156.gz

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/util.php b/lib/util.php
index 52f25c9d3..9c288198c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -349,13 +349,13 @@ function common_render_content($text) {
 
 // where should the avatar go for this user?
 
-function common_avatar_filename($user, $extension, $size=NULL) {
+function common_avatar_filename($user, $extension, $size=NULL, $extra=NULL) {
 	global $config;
 
 	if ($size) {
-		return $user->id . '-' . $size . $extension;
+		return $user->id . '-' . $size . (($extra) ? $extra : '') . $extension;
 	} else {
-		return $user->id . '-original' . $extension;
+		return $user->id . '-original' . (($extra) ? $extra : '') . $extension;
 	}
 }
 
@@ -479,6 +479,10 @@ function common_mtrand($bytes) {
 	return $enc;
 }
 
+function common_timestamp() {
+	return date('YmdHisu');
+}
+	
 // XXX: set up gettext
 
 function _t($str) {