X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Favatar.php;h=023a8414a18252338f87eeebf581401d41d3ffdd;hb=de56ccca07e19c5163792c210ff5f6130e91d892;hp=43f02a88d593cfe42e87a17db1058d4d24b4f108;hpb=3f5ededc01d8eedac2a9a75917849fbe78a3e701;p=quix0rs-gnu-social.git

diff --git a/actions/avatar.php b/actions/avatar.php
index 43f02a88d5..023a8414a1 100644
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -108,7 +108,7 @@ class AvatarAction extends SettingsAction {
 
 		$user = common_current_user();
 
-		$filename = common_avatar_filename($user, image_type_to_extension($info[2]));
+		$filename = common_avatar_filename($user, image_type_to_extension($info[2]), NULL, common_timestamp());
 		$filepath = common_avatar_path($filename);
 
 		if (!move_uploaded_file($_FILES['avatarfile']['tmp_name'], $filepath)) {
@@ -128,17 +128,6 @@ class AvatarAction extends SettingsAction {
 		$avatar->url = common_avatar_url($filename);
 		$avatar->created = DB_DataObject_Cast::dateTime(); # current time
 
-		$val = $avatar->validate();
-		
-		if ($val !== TRUE) {
-			$err = '';
-			foreach ($val as $k=>$v) {
-				$err .= _t('Something wrong with ') . $k;
-				$this->show_form($err);
-				return;
-			}
-		}
-		
 		foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
 			$scaled[] = $this->scale_avatar($user, $avatar, $size);
 		}
@@ -177,9 +166,9 @@ class AvatarAction extends SettingsAction {
 		imagecopyresampled($image_s, $image_a, 0, 0, 0, 0,
 						   $size, $size, $square, $square);
 
-		$ext = ($avatar->mediattype == 'image/jpeg') ? ".jpg" : ".png";
+		$ext = ($avatar->mediattype == 'image/jpeg') ? ".jpeg" : ".png";
 
-		$filename = common_avatar_filename($user, $ext, $size);
+		$filename = common_avatar_filename($user, $ext, $size, common_timestamp());
 
 		if ($avatar->mediatype == 'image/jpeg') {
 			imagejpeg($image_s, common_avatar_path($filename));