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

Allow %f2 and other escape sequences in editor link

Browse Source 
Test Plan: Open in Editor.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran

Differential Revision: https://secure.phabricator.com/D2184
This commit is contained in:
vrana
2012-04-10 00:55:31 -07:00
parent e87e1786a6
commit 935f3657b5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/applications/people/controller/settings/panels/preferences/PhabricatorUserPreferenceSettingsPanelController.php
View File

@@ -81,7 +81,7 @@ EXAMPLE;
->setCaption( ->setCaption(
'Link to edit files in external editor. '. 'Link to edit files in external editor. '.
'%f is replaced by filename, %l by line number, %r by repository '. '%f is replaced by filename, %l by line number, %r by repository '.
'callsign. '. 'callsign, %% by literal %. '.
"For documentation, see {$editor_doc_link}.") "For documentation, see {$editor_doc_link}.")
->setValue($preferences->getPreference($pref_editor))) ->setValue($preferences->getPreference($pref_editor)))
->appendChild( ->appendChild(

1
src/applications/people/storage/user/PhabricatorUser.php
View File

@@ -418,6 +418,7 @@ final class PhabricatorUser extends PhabricatorUserDAO {
PhabricatorUserPreferences::PREFERENCE_EDITOR); PhabricatorUserPreferences::PREFERENCE_EDITOR);
if ($editor) { if ($editor) {
return strtr($editor, array( return strtr($editor, array(
'%%' => '%',
'%f' => phutil_escape_uri($path), '%f' => phutil_escape_uri($path),
'%l' => phutil_escape_uri($line), '%l' => phutil_escape_uri($line),
'%r' => phutil_escape_uri($callsign), '%r' => phutil_escape_uri($callsign),