diff --git a/.divinerconfig b/.divinerconfig index e6d9ecae96..8764c9a487 100644 --- a/.divinerconfig +++ b/.divinerconfig @@ -1,6 +1,6 @@ { "name" : "Phabricator", - "src_base" : "https://secure.phabricator.com/diffusion/P/browse/origin:master", + "src_base" : "https://secure.phabricator.com/diffusion/P/browse/master", "groups" : { "intro" : "Introduction", "config" : "Configuration", @@ -30,4 +30,3 @@ ["DivinerXHPEngine", {}] ] } - diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php index 113f9b824f..2c2c177380 100644 --- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php @@ -523,11 +523,11 @@ class AphrontDefaultApplicationConfiguration $browse = array( 'arcanist' => - $host.'/diffusion/ARC/browse/origin:master/src/', + $host.'/diffusion/ARC/browse/master/src/', 'phutil' => - $host.'/diffusion/PHU/browse/origin:master/src/', + $host.'/diffusion/PHU/browse/master/src/', 'phabricator' => - $host.'/diffusion/P/browse/origin:master/src/', + $host.'/diffusion/P/browse/master/src/', ); $rows = array(); diff --git a/src/applications/diffusion/request/base/DiffusionRequest.php b/src/applications/diffusion/request/base/DiffusionRequest.php index d1413a9d4c..7d445fe284 100644 --- a/src/applications/diffusion/request/base/DiffusionRequest.php +++ b/src/applications/diffusion/request/base/DiffusionRequest.php @@ -326,6 +326,7 @@ abstract class DiffusionRequest { } if (strlen($path)) { + $path = ltrim($path, '/'); $path = str_replace(array(';', '$'), array(';;', '$$'), $path); $path = phutil_escape_uri($path); } diff --git a/src/applications/diffusion/view/base/DiffusionView.php b/src/applications/diffusion/view/base/DiffusionView.php index 223844c563..7f3b094fce 100644 --- a/src/applications/diffusion/view/base/DiffusionView.php +++ b/src/applications/diffusion/view/base/DiffusionView.php @@ -74,7 +74,7 @@ abstract class DiffusionView extends AphrontView { final public function linkBrowse($path, array $details = array()) { $href = $this->getDiffusionRequest()->generateURI( - array( + $details + array( 'action' => 'browse', 'path' => $path, ));