From 209edcd75a935a95342d0449fdb6d42348e07284 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 18 Sep 2013 08:57:16 -0700 Subject: [PATCH] Fix two minor Differential issues Summary: - D6966 accidentally reversed the order of `$diffs`. Reverse it back. - The new policy header stuff returns `array(icon, text)` but gets `strlen()`'d by a caller. Silence that warning for now. Test Plan: Created a revision with several diffs. Saw them in the right order; saw no warning on the diff attach screen. Reviewers: chad, btrahan Reviewed By: chad CC: aran, mbishopim3 Differential Revision: https://secure.phabricator.com/D7023 --- .../controller/DifferentialRevisionViewController.php | 1 + .../DifferentialDiffViewPolicyFieldSpecification.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index 7b9bae6b4b..3786301182 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -33,6 +33,7 @@ final class DifferentialRevisionViewController extends DifferentialController { ->setViewer($request->getUser()) ->withRevisionIDs(array($this->revisionID)) ->execute(); + $diffs = array_reverse($diffs); if (!$diffs) { throw new Exception( diff --git a/src/applications/differential/field/specification/DifferentialDiffViewPolicyFieldSpecification.php b/src/applications/differential/field/specification/DifferentialDiffViewPolicyFieldSpecification.php index 857db99f2c..ffc5b73deb 100644 --- a/src/applications/differential/field/specification/DifferentialDiffViewPolicyFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialDiffViewPolicyFieldSpecification.php @@ -19,7 +19,9 @@ final class DifferentialDiffViewPolicyFieldSpecification $user, $diff); - return idx($descriptions, PhabricatorPolicyCapability::CAN_VIEW); + // TODO: Clean this up with new policy UI. + $policy = idx($descriptions, PhabricatorPolicyCapability::CAN_VIEW); + return $policy[1]; } }