D17024.id40951.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D17024.id40951.diff
View Options

	diff --git a/src/applications/config/check/PhabricatorSetupCheck.php b/src/applications/config/check/PhabricatorSetupCheck.php
	--- a/src/applications/config/check/PhabricatorSetupCheck.php
	+++ b/src/applications/config/check/PhabricatorSetupCheck.php
	@@ -82,12 +82,12 @@
	AphrontWriteGuard::allowDangerousUnguardedWrites(true);
	}

	- $caught = null;
	try {
	$db_cache = new PhabricatorKeyValueDatabaseCache();
	$db_cache->deleteKey('phabricator.setup.issue-keys');
	} catch (Exception $ex) {
	- $caught = $ex;
	+ // If we hit an exception here, just ignore it. In particular, this can
	+ // happen on initial startup before the databases are initialized.
	}

	if ($use_scope) {
	@@ -95,10 +95,6 @@
	} else {
	AphrontWriteGuard::allowDangerousUnguardedWrites(false);
	}
	-
	- if ($caught) {
	- throw $caught;
	- }
	}

	final public static function setOpenSetupIssueKeys(
	diff --git a/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php b/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php
	--- a/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php
	+++ b/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php
	@@ -159,7 +159,7 @@
	$user_phid);
	} else {
	$cache = PhabricatorCaches::getMutableStructureCache();
	- $cache->deleteKey(PhabricatorUserPreferences::getGlobalCacheKey());
	+ $cache->deleteKey(PhabricatorUser::getGlobalSettingsCacheKey());

	PhabricatorUserCache::clearCacheForAllUsers(
	PhabricatorUserPreferencesCacheType::KEY_PREFERENCES);