Page MenuHomePhabricator
Files F15428375

D18537.id.diff
No OneTemporary
Actions

D18537.id.diff
View Options

diff --git a/src/applications/passphrase/view/PassphraseCredentialControl.php b/src/applications/passphrase/view/PassphraseCredentialControl.php
--- a/src/applications/passphrase/view/PassphraseCredentialControl.php
+++ b/src/applications/passphrase/view/PassphraseCredentialControl.php
@@ -53,13 +53,22 @@
if (strlen($current_phid) && empty($options_map[$current_phid])) {
$viewer = $this->getViewer();
- $user_credential = id(new PassphraseCredentialQuery())
- ->setViewer($viewer)
- ->withPHIDs(array($current_phid))
- ->executeOne();
- if (!$user_credential) {
+ $current_name = null;
+ try {
+ $user_credential = id(new PassphraseCredentialQuery())
+ ->setViewer($viewer)
+ ->withPHIDs(array($current_phid))
+ ->executeOne();
+
+ if ($user_credential) {
+ $current_name = pht(
+ '%s %s',
+ $user_credential->getMonogram(),
+ $user_credential->getName());
+ }
+ } catch (PhabricatorPolicyException $policy_exception) {
// Pull the credential with the ominipotent viewer so we can look up
- // the ID and tell if it's restricted or invalid.
+ // the ID and provide the monogram.
$omnipotent_credential = id(new PassphraseCredentialQuery())
->setViewer(PhabricatorUser::getOmnipotentUser())
->withPHIDs(array($current_phid))
@@ -68,16 +77,13 @@
$current_name = pht(
'%s (Restricted Credential)',
$omnipotent_credential->getMonogram());
- } else {
- $current_name = pht(
- 'Invalid Credential ("%s")',
- $current_phid);
}
- } else {
+ }
+
+ if ($current_name === null) {
$current_name = pht(
- '%s %s',
- $user_credential->getMonogram(),
- $user_credential->getName());
+ 'Invalid Credential ("%s")',
+ $current_phid);
}
$options_map = array(

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 24, 7:58 PM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7642347
Default Alt Text
D18537.id.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility