View Options

	diff --git a/src/applications/differential/mail/comment/DifferentialCommentMail.php b/src/applications/differential/mail/comment/DifferentialCommentMail.php
	index 6110d0ac8f..42eb8c7155 100644
	--- a/src/applications/differential/mail/comment/DifferentialCommentMail.php
	+++ b/src/applications/differential/mail/comment/DifferentialCommentMail.php
	@@ -1,132 +1,134 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class DifferentialCommentMail extends DifferentialMail {

	protected $changedByCommit;

	public function setChangedByCommit($changed_by_commit) {
	$this->changedByCommit = $changed_by_commit;
	return $this;
	}

	public function getChangedByCommit() {
	return $this->changedByCommit;
	}

	public function __construct(
	DifferentialRevision $revision,
	PhabricatorObjectHandle $actor,
	DifferentialComment $comment,
	array $changesets,
	array $inline_comments) {

	$this->setRevision($revision);
	$this->setActorHandle($actor);
	$this->setComment($comment);
	$this->setChangesets($changesets);
	$this->setInlineComments($inline_comments);

	}

	protected function renderSubject() {
	$revision = $this->getRevision();
	$verb = $this->getVerb();
	return ucwords($verb).': '.$revision->getTitle();
	}

	protected function getVerb() {
	$comment = $this->getComment();
	$action = $comment->getAction();
	$verb = DifferentialAction::getActionPastTenseVerb($action);
	return $verb;
	}

	protected function renderBody() {

	$comment = $this->getComment();

	$actor = $this->getActorName();
	$name = $this->getRevision()->getTitle();
	$verb = $this->getVerb();

	$body = array();

	$body[] = "{$actor} has {$verb} the revision \"{$name}\".";
	$body[] = null;

	$content = $comment->getContent();
	if (strlen($content)) {
	$body[] = $this->formatText($content);
	$body[] = null;
	}

	if ($this->getChangedByCommit()) {
	$body[] = 'CHANGED PRIOR TO COMMIT';
	$body[] = ' This revision was updated prior to commit.';
	$body[] = null;
	}

	$inlines = $this->getInlineComments();
	if ($inlines) {
	$body[] = 'INLINE COMMENTS';
	$changesets = $this->getChangesets();
	foreach ($inlines as $inline) {
	$changeset = $changesets[$inline->getChangesetID()];
	if (!$changeset) {
	throw new Exception('Changeset missing!');
	}
	$file = $changeset->getFilename();
	$start = $inline->getLineNumber();
	$len = $inline->getLineLength();
	if ($len) {
	$range = $start.'-'.($start + $len);
	} else {
	$range = $start;
	}
	$content = $inline->getContent();
	$body[] = $this->formatText("{$file}:{$range} {$content}");
	}
	$body[] = null;
	}

	$body[] = $this->renderRevisionDetailLink();
	$body[] = null;

	$revision = $this->getRevision();
	if ($revision->getStatus() == DifferentialRevisionStatus::COMMITTED) {
	$phids = $revision->loadCommitPHIDs();
	- $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
	- if (count($handles) == 1) {
	- $body[] = "COMMIT";
	- } else {
	- // This is unlikely to ever happen since we'll send this mail the first
	- // time we discover a commit, but it's not impossible if data was
	- // migrated, etc.
	- $body[] = "COMMITS";
	- }
	+ if ($phids) {
	+ $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
	+ if (count($handles) == 1) {
	+ $body[] = "COMMIT";
	+ } else {
	+ // This is unlikely to ever happen since we'll send this mail the
	+ // first time we discover a commit, but it's not impossible if data
	+ // was migrated, etc.
	+ $body[] = "COMMITS";
	+ }

	- foreach ($handles as $handle) {
	- $body[] = ' '.PhabricatorEnv::getProductionURI($handle->getURI());
	+ foreach ($handles as $handle) {
	+ $body[] = ' '.PhabricatorEnv::getProductionURI($handle->getURI());
	+ }
	+ $body[] = null;
	}
	- $body[] = null;
	}

	return implode("\n", $body);
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 16:08 (2 w, 6 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1126328
Default Alt Text: (4 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions