@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
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
+10
-7
+9
-6
src/applications/auth/provider/PhabricatorAuthProvider.php
+9
-6
src/applications/auth/provider/PhabricatorAuthProvider.php
···
150
150
// PhabricatorFile right now. The storage will get shared, so the impact
151
151
// here is negligible.
152
152
153
-
$image_uri = $account->getAccountImageURI();
154
-
$image_file = PhabricatorFile::newFromFileDownload(
155
-
$image_uri,
156
-
array(
157
-
'name' => $name,
158
-
));
153
+
$image_uri = $adapter->getAccountImageURI();
154
+
155
+
$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
156
+
$image_file = PhabricatorFile::newFromFileDownload(
157
+
$image_uri,
158
+
array(
159
+
'name' => $name,
160
+
));
161
+
unset($unguarded);
159
162
160
163
$account->setProfileImagePHID($image_file->getPHID());
161
164
} catch (Exception $ex) {
+1
-1
src/applications/auth/view/PhabricatorAuthAccountView.php
+1
-1
src/applications/auth/view/PhabricatorAuthAccountView.php
···
95
95
$image_uri = PhabricatorUser::getDefaultProfileImageURI();
96
96
if ($account->getProfileImagePHID()) {
97
97
$image = id(new PhabricatorFileQuery())
98
-
->setUser(PhabricatorUser::getOmnipotentUser())
98
+
->setViewer(PhabricatorUser::getOmnipotentUser())
99
99
->withPHIDs(array($account->getProfileImagePHID()))
100
100
->executeOne();
101
101
if ($image) {