From 620e936cba77f122dea27cb2ffd30f8d589daefa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 21 Mar 2012 16:58:44 -0700
Subject: [PATCH] Fix symbol URI generation to include default branch name for
 relevant repositories

Summary: We need to build a request in order to pick up an appropriate default branch name, instead of using the raw static generator.

Test Plan: Clicked a symbol link, got /master/path/blahblah

Reviewers: vrana, btrahan

Reviewed By: vrana

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1982
---
 .../controller/symbol/DiffusionSymbolController.php        | 1 -
 .../storage/symbol/PhabricatorRepositorySymbol.php         | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/applications/diffusion/controller/symbol/DiffusionSymbolController.php b/src/applications/diffusion/controller/symbol/DiffusionSymbolController.php
index 9e4d5a35d1..abf5499cb7 100644
--- a/src/applications/diffusion/controller/symbol/DiffusionSymbolController.php
+++ b/src/applications/diffusion/controller/symbol/DiffusionSymbolController.php
@@ -145,7 +145,6 @@ final class DiffusionSymbolController extends DiffusionController {
         '',
         '',
         '',
-        'n'
       ));
     $table->setNoDataString(
       "No matching symbol could be found in any indexed project.");
diff --git a/src/applications/repository/storage/symbol/PhabricatorRepositorySymbol.php b/src/applications/repository/storage/symbol/PhabricatorRepositorySymbol.php
index 4b5da1b355..250a1100cb 100644
--- a/src/applications/repository/storage/symbol/PhabricatorRepositorySymbol.php
+++ b/src/applications/repository/storage/symbol/PhabricatorRepositorySymbol.php
@@ -45,10 +45,13 @@ final class PhabricatorRepositorySymbol extends PhabricatorRepositoryDAO {
   }
 
   public function getURI() {
-    return DiffusionRequest::generateDiffusionURI(
+    $request = DiffusionRequest::newFromDictionary(
+      array(
+        'repository'  => $this->getRepository(),
+      ));
+    return $request->generateURI(
       array(
         'action'    => 'browse',
-        'callsign'  => $this->getRepository()->getCallsign(),
         'path'      => $this->getPath(),
         'line'      => $this->getLineNumber(),
       ));