D25239.1736595796.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D25239.1736595796.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
	@@ -50,7 +50,8 @@
	// credential. Populate it into the menu to allow them to save the form
	// without making any changes.
	$current_phid = $this->getValue();
	- if (strlen($current_phid) && empty($options_map[$current_phid])) {
	+ if (phutil_nonempty_string($current_phid) &&
	+ empty($options_map[$current_phid])) {
	$viewer = $this->getViewer();

	$current_name = null;
	diff --git a/src/infrastructure/customfield/field/PhabricatorCustomField.php b/src/infrastructure/customfield/field/PhabricatorCustomField.php
	--- a/src/infrastructure/customfield/field/PhabricatorCustomField.php
	+++ b/src/infrastructure/customfield/field/PhabricatorCustomField.php
	@@ -891,8 +891,11 @@
	public function setValueFromApplicationTransactions($value) {
	if ($this->proxy) {
	return $this->proxy->setValueFromApplicationTransactions($value);
	+ } else if ($value) {
	+ return $this->setValueFromStorage($value);
	+ } else {
	+ return $value;
	}
	- return $this->setValueFromStorage($value);
	}