archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into blender-tweaks

Browse Source
This commit is contained in:
Sergey Sharybin
2019-04-04 11:21:47 +02:00
parent dc84bc9391 18732a0d2f
commit ef26d6afdc
628 changed files with 19135 additions and 6476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/applications/differential/controller/DifferentialDiffCreateController.php
View File

@@ -71,7 +71,7 @@ final class DifferentialDiffCreateController extends DifferentialController {
$uri = $this->getApplicationURI("diff/{$diff_id}/");
$uri = new PhutilURI($uri);
if ($revision) {
$uri->setQueryParam('revisionID', $revision->getID());
$uri->replaceQueryParam('revisionID', $revision->getID());
}
return id(new AphrontRedirectResponse())->setURI($uri);
@@ -128,7 +128,7 @@ final class DifferentialDiffCreateController extends DifferentialController {
$arcanist_link,
),
pht(
'You can also paste a diff below, or upload a file '.
'You can also paste a diff above, or upload a file '.
'containing a diff (for example, from %s, %s or %s).',
phutil_tag('tt', array(), 'svn diff'),
phutil_tag('tt', array(), 'git diff'),