add w3dtf date to rss 1.0 items

[quix0rs-gnu-social.git] / actions / avatar.php

diff --git a/actions/avatar.php b/actions/avatar.php
index 17f56634b30d94037b83c060704a7749e9a7d6d9..33b5452d0b3b68802784f00aa8d43f546151033a 100644 (file)
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -128,6 +128,17 @@ 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);
                }
@@ -139,7 +150,6 @@ class AvatarAction extends SettingsAction {
                        common_server_error(_t('Error deleting old avatars.'));
                        return;
                }
-
                if (!$avatar->insert()) {
                        @unlink($filepath);
                        common_server_error(_t('Error inserting avatar.'));