Page MenuHomePhabricator
Files F13995806

D16117.id38778.diff
No OneTemporary
Actions

D16117.id38778.diff
View Options

diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
@@ -190,6 +190,10 @@
'The Differential revision list view age UI elements have been removed '.
'to simplify the interface.');
+ $global_settings_reason = pht(
+ 'The "Re: Prefix" and "Vary Subjects" settings are now configured '.
+ 'in global settings.');
+
$ancient_config += array(
'phid.external-loaders' =>
pht(
@@ -321,6 +325,9 @@
'differential.days-fresh' => $stale_reason,
'differential.days-stale' => $stale_reason,
+
+ 'metamta.re-prefix' => $global_settings_reason,
+ 'metamta.vary-subjects' => $global_settings_reason,
);
return $ancient_config;
diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -276,22 +276,6 @@
))
->setSummary(pht('Show email preferences link in email.'))
->setDescription($email_preferences_description),
- $this->newOption('metamta.re-prefix', 'bool', false)
- ->setBoolOptions(
- array(
- pht('Force "Re:" Subject Prefix'),
- pht('No "Re:" Subject Prefix'),
- ))
- ->setSummary(pht('Control "Re:" subject prefix, for Mail.app.'))
- ->setDescription($re_prefix_description),
- $this->newOption('metamta.vary-subjects', 'bool', true)
- ->setBoolOptions(
- array(
- pht('Allow Varied Subjects'),
- pht('Always Use the Same Thread Subject'),
- ))
- ->setSummary(pht('Control subject variance, for some mail clients.'))
- ->setDescription($vary_subjects_description),
$this->newOption('metamta.insecure-auth-with-reply-to', 'bool', false)
->setBoolOptions(
array(
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -1131,27 +1131,16 @@
}
private function shouldAddRePrefix(PhabricatorUserPreferences $preferences) {
- $default_value = PhabricatorEnv::getEnvConfig('metamta.re-prefix');
-
- $value = $preferences->getPreference(
+ $value = $preferences->getSettingValue(
PhabricatorEmailRePrefixSetting::SETTINGKEY);
- if ($value === null) {
- return $default_value;
- }
return ($value == PhabricatorEmailRePrefixSetting::VALUE_RE_PREFIX);
}
private function shouldVarySubject(PhabricatorUserPreferences $preferences) {
- $default_value = PhabricatorEnv::getEnvConfig('metamta.vary-subjects');
-
- $value = $preferences->getPreference(
+ $value = $preferences->getSettingValue(
PhabricatorEmailVarySubjectsSetting::SETTINGKEY);
- if ($value === null) {
- return $default_value;
- }
-
return ($value == PhabricatorEmailVarySubjectsSetting::VALUE_VARY_SUBJECTS);
}
diff --git a/src/applications/settings/setting/PhabricatorEmailRePrefixSetting.php b/src/applications/settings/setting/PhabricatorEmailRePrefixSetting.php
--- a/src/applications/settings/setting/PhabricatorEmailRePrefixSetting.php
+++ b/src/applications/settings/setting/PhabricatorEmailRePrefixSetting.php
@@ -39,7 +39,7 @@
}
public function getSettingDefaultValue() {
- return self::VALUE_RE_PREFIX;
+ return self::VALUE_NO_PREFIX;
}
protected function getSelectOptions() {

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 24, 3:42 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6723441
Default Alt Text
D16117.id38778.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility