diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php index b180412254..43f33572a8 100644 --- a/src/applications/differential/view/DifferentialChangesetListView.php +++ b/src/applications/differential/view/DifferentialChangesetListView.php @@ -127,14 +127,9 @@ final class DifferentialChangesetListView extends AphrontView { $ref, $changeset); - $prefs = $this->user->loadPreferences(); - $pref_symbols = $prefs->getPreference( - PhabricatorUserPreferences::PREFERENCE_DIFFUSION_SYMBOLS); $detail->setChangeset($changeset); $detail->addButton($view_options); - if ($pref_symbols != 'disabled') { - $detail->setSymbolIndex(idx($this->symbolIndexes, $key)); - } + $detail->setSymbolIndex(idx($this->symbolIndexes, $key)); $detail->setVsChangesetID(idx($this->vsMap, $changeset->getID())); $detail->setEditable(true); diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php index ac1e0abb80..2bcd13e008 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -251,10 +251,7 @@ final class DiffusionBrowseFileController extends DiffusionController { $lang = last(explode('.', $drequest->getPath())); - $prefs = $this->getRequest()->getUser()->loadPreferences(); - $pref_symbols = $prefs->getPreference( - PhabricatorUserPreferences::PREFERENCE_DIFFUSION_SYMBOLS); - if (isset($langs[$lang]) && $pref_symbols != 'disabled') { + if (isset($langs[$lang])) { Javelin::initBehavior( 'repository-crossreference', array( diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php index 64195bd14d..d301775d21 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php @@ -24,8 +24,6 @@ final class PhabricatorSettingsPanelDisplayPreferences $pref_editor = PhabricatorUserPreferences::PREFERENCE_EDITOR; $pref_multiedit = PhabricatorUserPreferences::PREFERENCE_MULTIEDIT; $pref_titles = PhabricatorUserPreferences::PREFERENCE_TITLES; - $pref_symbols = - PhabricatorUserPreferences::PREFERENCE_DIFFUSION_SYMBOLS; $pref_monospaced_textareas = PhabricatorUserPreferences::PREFERENCE_MONOSPACED_TEXTAREAS; @@ -40,9 +38,6 @@ final class PhabricatorSettingsPanelDisplayPreferences $preferences->setPreference( $pref_multiedit, $request->getStr($pref_multiedit)); - $preferences->setPreference( - $pref_symbols, - $request->getStr($pref_symbols)); $preferences->setPreference($pref_monospaced, $monospaced); $preferences->setPreference( $pref_monospaced_textareas, @@ -74,7 +69,6 @@ EXAMPLE; $font_default = PhabricatorEnv::getEnvConfig('style.monospace'); $font_default = phutil_escape_html($font_default); - $pref_symbols_value = $preferences->getPreference($pref_symbols); $pref_monospaced_textareas_value = $preferences ->getPreference($pref_monospaced_textareas); if (!$pref_monospaced_textareas_value) { @@ -132,15 +126,6 @@ EXAMPLE; '
'.
           phutil_escape_html($example_string).
           '
')) - ->appendChild( - id(new AphrontFormRadioButtonControl()) - ->setLabel('Symbol Links') - ->setName($pref_symbols) - ->setValue($pref_symbols_value ? $pref_symbols_value : 'enabled') - ->addButton('enabled', 'Enabled (default)', - 'Use this setting to disable linking symbol names in Differential '. - 'and Diffusion to their definitions. This is enabled by default.') - ->addButton('disabled', 'Disabled', null)) ->appendChild( id(new AphrontFormRadioButtonControl()) ->setLabel('Monospaced Textareas') diff --git a/src/applications/settings/storage/PhabricatorUserPreferences.php b/src/applications/settings/storage/PhabricatorUserPreferences.php index 4338e1ef61..e5910cf833 100644 --- a/src/applications/settings/storage/PhabricatorUserPreferences.php +++ b/src/applications/settings/storage/PhabricatorUserPreferences.php @@ -18,7 +18,6 @@ final class PhabricatorUserPreferences extends PhabricatorUserDAO { const PREFERENCE_SEARCH_SHORTCUT = 'search-shortcut'; const PREFERENCE_DIFFUSION_VIEW = 'diffusion-view'; - const PREFERENCE_DIFFUSION_SYMBOLS = 'diffusion-symbols'; const PREFERENCE_NAV_WIDTH = 'nav-width'; const PREFERENCE_APP_TILES = 'app-tiles';