D11791.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11791.diff
View Options

	diff --git a/src/applications/people/conduit/UserConduitAPIMethod.php b/src/applications/people/conduit/UserConduitAPIMethod.php
	--- a/src/applications/people/conduit/UserConduitAPIMethod.php
	+++ b/src/applications/people/conduit/UserConduitAPIMethod.php
	@@ -23,8 +23,10 @@

	$primary = $user->loadPrimaryEmail();
	if ($primary && $primary->getIsVerified()) {
	+ $email = $primary->getAddress();
	$roles[] = 'verified';
	} else {
	+ $email = null;
	$roles[] = 'unverified';
	}

	@@ -37,12 +39,13 @@
	}

	$return = array(
	- 'phid' => $user->getPHID(),
	- 'userName' => $user->getUserName(),
	- 'realName' => $user->getRealName(),
	- 'image' => $user->getProfileImageURI(),
	- 'uri' => PhabricatorEnv::getURI('/p/'.$user->getUsername().'/'),
	- 'roles' => $roles,
	+ 'phid' => $user->getPHID(),
	+ 'userName' => $user->getUserName(),
	+ 'realName' => $user->getRealName(),
	+ 'primaryEmail' => $email,
	+ 'image' => $user->getProfileImageURI(),
	+ 'uri' => PhabricatorEnv::getURI('/p/'.$user->getUsername().'/'),
	+ 'roles' => $roles,
	);

	if ($current_status) {