Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #73 from mareksapota-fb/master

Pull request for differential revision D1021
  • Loading branch information...
commit dfa2e29a012f5e9c9aad8266fc6b27c9578606c2 2 parents b896341 + 5148741
@epriestley epriestley authored
View
11 src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
@@ -178,10 +178,12 @@ public function setThreadID($thread_id, $is_first_message = false) {
* @return this
*/
public function saveAndSend() {
- $ret = $this->save();
+ $ret = null;
if (PhabricatorEnv::getEnvConfig('metamta.send-immediately')) {
- $this->sendNow();
+ $ret = $this->sendNow();
+ } else {
+ $ret = $this->save();
}
return $ret;
@@ -343,8 +345,7 @@ public function sendNow(
} catch (Exception $ex) {
$this->setStatus(self::STATUS_FAIL);
$this->setMessage($ex->getMessage());
- $this->save();
- return;
+ return $this->save();
}
if ($this->getRetryCount() < $this->getSimulatedFailureCount()) {
@@ -373,7 +374,7 @@ public function sendNow(
$this->setStatus(self::STATUS_SENT);
}
- $this->save();
+ return $this->save();
}
public static function getReadableStatus($status_code) {
Please sign in to comment.
Something went wrong with that request. Please try again.