View Options

	diff --git a/src/applications/people/cache/PhabricatorUserPreferencesCacheType.php b/src/applications/people/cache/PhabricatorUserPreferencesCacheType.php
	index 7fee680def..b4c8dc6a45 100644
	--- a/src/applications/people/cache/PhabricatorUserPreferencesCacheType.php
	+++ b/src/applications/people/cache/PhabricatorUserPreferencesCacheType.php
	@@ -1,72 +1,82 @@
	<?php

	final class PhabricatorUserPreferencesCacheType
	extends PhabricatorUserCacheType {

	const CACHETYPE = 'preferences';

	- const KEY_PREFERENCES = 'user.preferences.v1';
	+ const KEY_PREFERENCES = 'user.preferences.v2';

	public function getAutoloadKeys() {
	return array(
	self::KEY_PREFERENCES,
	);
	}

	public function canManageKey($key) {
	return ($key === self::KEY_PREFERENCES);
	}

	public function getValueFromStorage($value) {
	return phutil_json_decode($value);
	}

	public function newValueForUsers($key, array $users) {
	$viewer = $this->getViewer();

	$users = mpull($users, null, 'getPHID');
	$user_phids = array_keys($users);

	$preferences = id(new PhabricatorUserPreferencesQuery())
	->setViewer($viewer)
	->withUsers($users)
	->needSyntheticPreferences(true)
	->execute();
	$preferences = mpull($preferences, null, 'getUserPHID');

	$all_settings = PhabricatorSetting::getAllSettings();

	$settings = array();
	foreach ($users as $user_phid => $user) {
	$preference = idx($preferences, $user_phid);

	if (!$preference) {
	continue;
	}

	foreach ($all_settings as $key => $setting) {
	$value = $preference->getSettingValue($key);

	+ try {
	+ id(clone $setting)
	+ ->setViewer($viewer)
	+ ->assertValidValue($value);
	+ } catch (Exception $ex) {
	+ // If the saved value isn't valid, don't cache it: we'll use the
	+ // default value instead.
	+ continue;
	+ }
	+
	// As an optimization, we omit the value from the cache if it is
	// exactly the same as the hardcoded default.
	$default_value = id(clone $setting)
	->setViewer($user)
	->getSettingDefaultValue();
	if ($value === $default_value) {
	continue;
	}

	$settings[$user_phid][$key] = $value;
	}
	}

	$results = array();
	foreach ($user_phids as $user_phid) {
	$value = idx($settings, $user_phid, array());
	$results[$user_phid] = phutil_json_encode($value);
	}

	return $results;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Wed, Nov 5, 3:13 PM (3 h, 30 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 320983
Default Alt Text: (2 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions