Merge branch 'upload'

2011-02-10 16:15:18 -08:00
parent 70fd45b139 03b88d1da3
commit a3584efe78
1 changed files with 5 additions and 2 deletions
--- a/src/applications/people/controller/settings/PhabricatorUserSettingsController.php
+++ b/src/applications/people/controller/settings/PhabricatorUserSettingsController.php
@@ -73,8 +73,11 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
            ->setURI('/settings/page/arcanist/?regenerated=true');
        case 'account':
          if (!empty($_FILES['profile'])) {
-            $file = PhabricatorFile::newFromPHPUpload($_FILES['profile']);
-            $user->setProfileImagePHID($file->getPHID());
+            $err = idx($_FILES['profile'], 'error');
+            if ($err != UPLOAD_ERR_NO_FILE) {
+              $file = PhabricatorFile::newFromPHPUpload($_FILES['profile']);
+              $user->setProfileImagePHID($file->getPHID());
+            }
          }

          $user->save();