revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 08:52:39 +01:00
Code Issues Releases Wiki Activity

Diffusion - be sure to properly unserialize result from conduit query

Browse source 
Summary: Fixes T7256.

Test Plan: Looked at rXPRF0a7a5f69f5d7 in a local instance. things looked great both pre and post patch.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Maniphest Tasks: T7256

Differential Revision: https://secure.phabricator.com/D11790
This commit is contained in:
Bob Trahan 2015-02-17 13:54:59 -08:00
parent 733a9c40ee
commit 3fcc3fdedf
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
View file

@ -61,9 +61,10 @@ final class DiffusionMergedCommitsQueryConduitAPIMethod
// Remove the merge commit. // Remove the merge commit.
$hashes = array_diff($hashes, array($commit)); $hashes = array_diff($hashes, array($commit));
return DiffusionQuery::loadHistoryForCommitIdentifiers( $history = DiffusionQuery::loadHistoryForCommitIdentifiers(
$hashes, $hashes,
$drequest); $drequest);
return mpull($history, 'toDictionary');
} }
protected function getMercurialResult(ConduitAPIRequest $request) { protected function getMercurialResult(ConduitAPIRequest $request) {
@ -100,9 +101,10 @@ final class DiffusionMergedCommitsQueryConduitAPIMethod
// Remove the merge commit. // Remove the merge commit.
$hashes = array_diff($hashes, array($commit)); $hashes = array_diff($hashes, array($commit));
return DiffusionQuery::loadHistoryForCommitIdentifiers( $history = DiffusionQuery::loadHistoryForCommitIdentifiers(
$hashes, $hashes,
$drequest); $drequest);
return mpull($history, 'toDictionary');
} }
} }

1
src/applications/diffusion/controller/DiffusionCommitController.php
View file

@ -894,6 +894,7 @@ final class DiffusionCommitController extends DiffusionController {
if (!$merges) { if (!$merges) {
return null; return null;
} }
$merges = DiffusionPathChange::newFromConduit($merges);
$caption = null; $caption = null;
if (count($merges) > $limit) { if (count($merges) > $limit) {