From 86ff112eebe3387e50319ad11e38d8380a7bf867 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 17 Jun 2013 07:22:20 -0700
Subject: [PATCH] Fix some account profile image derps

Summary: Ref T1536. Several derps here.

Test Plan:
Oh hey this works now:

{F46610}

Reviewers: chad, btrahan

Reviewed By: chad

CC: aran

Maniphest Tasks: T1536

Differential Revision: https://secure.phabricator.com/D6211
---
 .../auth/provider/PhabricatorAuthProvider.php     | 15 +++++++++------
 .../auth/view/PhabricatorAuthAccountView.php      |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/applications/auth/provider/PhabricatorAuthProvider.php b/src/applications/auth/provider/PhabricatorAuthProvider.php
index 72d901b488..787d56b587 100644
--- a/src/applications/auth/provider/PhabricatorAuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorAuthProvider.php
@@ -150,12 +150,15 @@ abstract class PhabricatorAuthProvider {
       // PhabricatorFile right now. The storage will get shared, so the impact
       // here is negligible.
 
-      $image_uri = $account->getAccountImageURI();
-      $image_file = PhabricatorFile::newFromFileDownload(
-        $image_uri,
-        array(
-          'name' => $name,
-        ));
+      $image_uri = $adapter->getAccountImageURI();
+
+      $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+        $image_file = PhabricatorFile::newFromFileDownload(
+          $image_uri,
+          array(
+            'name' => $name,
+          ));
+      unset($unguarded);
 
       $account->setProfileImagePHID($image_file->getPHID());
     } catch (Exception $ex) {
diff --git a/src/applications/auth/view/PhabricatorAuthAccountView.php b/src/applications/auth/view/PhabricatorAuthAccountView.php
index 0b3d1f18a1..9cf19e65df 100644
--- a/src/applications/auth/view/PhabricatorAuthAccountView.php
+++ b/src/applications/auth/view/PhabricatorAuthAccountView.php
@@ -95,7 +95,7 @@ final class PhabricatorAuthAccountView extends AphrontView {
     $image_uri = PhabricatorUser::getDefaultProfileImageURI();
     if ($account->getProfileImagePHID()) {
       $image = id(new PhabricatorFileQuery())
-        ->setUser(PhabricatorUser::getOmnipotentUser())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
         ->withPHIDs(array($account->getProfileImagePHID()))
         ->executeOne();
       if ($image) {