better timestamped avatar filenames

darcs-hash:20080528143030-84dde-c698588b2db9e36a576c402ba685b5d205396948.gz

diff --git a/lib/util.php b/lib/util.php
index 86c71abb75fb5d555d83bb2a44ae94e7c0b9fb57..268c9ef2c97d22be0ae7f6d65b8beacfbe66f913 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -353,9 +353,9 @@ function common_avatar_filename($user, $extension, $size=NULL, $extra=NULL) {
        global $config;
 
        if ($size) {
-               return $user->id . '-' . $size . (($extra) ? $extra : '') . $extension;
+               return $user->id . '-' . $size . (($extra) ? ('-' . $extra) : '') . $extension;
        } else {
-               return $user->id . '-original' . (($extra) ? $extra : '') . $extension;
+               return $user->id . '-original' . (($extra) ? ('-' . $extra) : '') . $extension;
        }
 }
 
@@ -480,7 +480,7 @@ function common_mtrand($bytes) {
 }
 
 function common_timestamp() {
-       return date('YmdHisu');
+       return date('YmdHis');
 }
        
 // XXX: set up gettext