D11790.id28420.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11790.id28420.diff
View Options

	diff --git a/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
	+++ b/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
	@@ -61,9 +61,10 @@
	// Remove the merge commit.
	$hashes = array_diff($hashes, array($commit));

	- return DiffusionQuery::loadHistoryForCommitIdentifiers(
	+ $history = DiffusionQuery::loadHistoryForCommitIdentifiers(
	$hashes,
	$drequest);
	+ return mpull($history, 'toDictionary');
	}

	protected function getMercurialResult(ConduitAPIRequest $request) {
	@@ -100,9 +101,10 @@
	// Remove the merge commit.
	$hashes = array_diff($hashes, array($commit));

	- return DiffusionQuery::loadHistoryForCommitIdentifiers(
	+ $history = DiffusionQuery::loadHistoryForCommitIdentifiers(
	$hashes,
	$drequest);
	+ return mpull($history, 'toDictionary');
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
	--- a/src/applications/diffusion/controller/DiffusionCommitController.php
	+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
	@@ -894,6 +894,7 @@
	if (!$merges) {
	return null;
	}
	+ $merges = DiffusionPathChange::newFromConduit($merges);

	$caption = null;
	if (count($merges) > $limit) {