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 @@ -81,14 +81,6 @@ - Required if private reply-to addresses are configured. - Mail messages are sent in the language of user preference. -EODOC -)); - - $herald_hints_description = $this->deformat(pht(<<setLocked(true) ->setDescription(pht('Domain used for reply email addresses.')) ->addExample('phabricator.example.com', ''), - $this->newOption('metamta.herald.show-hints', 'bool', true) - ->setBoolOptions( - array( - pht('Show Herald Hints'), - pht('No Herald Hints'), - )) - ->setSummary(pht('Show hints about Herald rules in email.')) - ->setDescription($herald_hints_description), $this->newOption('metamta.recipients.show-hints', 'bool', true) ->setBoolOptions( array( diff --git a/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php b/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php --- a/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php +++ b/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php @@ -151,24 +151,6 @@ return $this; } - /** - * Add a Herald section with a rule management URI and a transcript URI. - * - * @param string URI to rule transcripts. - * @return this - * @task compose - */ - public function addHeraldSection($xscript_uri) { - if (!PhabricatorEnv::getEnvConfig('metamta.herald.show-hints')) { - return $this; - } - - $this->addLinkSection( - pht('WHY DID I GET THIS EMAIL?'), - PhabricatorEnv::getProductionURI($xscript_uri)); - - return $this; - } /** * Add an attachment. diff --git a/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php b/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php --- a/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php +++ b/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php @@ -10,36 +10,15 @@ bass trout -WHY DID I GET THIS EMAIL? - http://test.com/xscript/ - EOTEXT; - $this->assertEmail($expect, true); + $this->assertEmail($expect); } - public function testBodyRenderNoHerald() { - $expect = <<assertEmail($expect, false); - } - - private function assertEmail($expect, $herald_hints) { - $env = PhabricatorEnv::beginScopedEnv(); - $env->overrideEnvConfig('phabricator.production-uri', 'http://test.com/'); - $env->overrideEnvConfig('metamta.herald.show-hints', $herald_hints); - + private function assertEmail($expect) { $body = new PhabricatorMetaMTAMailBody(); $body->addRawSection('salmon'); $body->addTextSection('HEADER', "bass\ntrout\n"); - $body->addHeraldSection('/xscript/'); $this->assertEqual($expect, $body->render()); }