Fix diff-of-diffs to respect the right-hand-side diff.

2011-04-11 12:32:08 -07:00
parent f9a59c9f49
commit 461f608b5c
1 changed files with 7 additions and 0 deletions
--- a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
@@ -44,7 +44,14 @@ class DifferentialRevisionViewController extends DifferentialController {
    }

    $diff_vs = $request->getInt('vs');
+
    $target = end($diffs);
+    $target_id = $request->getInt('id');
+    if ($target_id) {
+      if (isset($diffs[$target_id])) {
+        $target = $diffs[$target_id];
+      }
+    }

    $diffs = mpull($diffs, null, 'getID');
    if (empty($diffs[$diff_vs])) {