Page MenuHomePhabricator
Files F18582297

D14931.id36083.diff
No OneTemporary
Actions

D14931.id36083.diff
View Options

diff --git a/src/applications/console/plugin/DarkConsoleErrorLogPlugin.php b/src/applications/console/plugin/DarkConsoleErrorLogPlugin.php
--- a/src/applications/console/plugin/DarkConsoleErrorLogPlugin.php
+++ b/src/applications/console/plugin/DarkConsoleErrorLogPlugin.php
@@ -64,7 +64,7 @@
$line .= ' called at ['.$entry['file'].':'.$entry['line'].']';
try {
$user = $this->getRequest()->getUser();
- $href = $user->loadEditorLink($entry['file'], $entry['line'], '');
+ $href = $user->loadEditorLink($entry['file'], $entry['line'], null);
} catch (Exception $ex) {
// The database can be inaccessible.
}
diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
--- a/src/applications/differential/view/DifferentialChangesetListView.php
+++ b/src/applications/differential/view/DifferentialChangesetListView.php
@@ -314,8 +314,7 @@
$changeset->getAbsoluteRepositoryPath($repository, $this->diff),
'/');
$line = idx($changeset->getMetadata(), 'line:first', 1);
- $callsign = $repository->getCallsign();
- $editor_link = $user->loadEditorLink($path, $line, $callsign);
+ $editor_link = $user->loadEditorLink($path, $line, $repository);
if ($editor_link) {
$meta['editor'] = $editor_link;
} else {
diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
@@ -435,9 +435,8 @@
$path = $drequest->getPath();
$line = nonempty((int)$drequest->getLine(), 1);
- $callsign = $repository->getCallsign();
- $editor_link = $user->loadEditorLink($path, $line, $callsign);
- $template = $user->loadEditorLink($path, '%l', $callsign);
+ $editor_link = $user->loadEditorLink($path, $line, $repository);
+ $template = $user->loadEditorLink($path, '%l', $repository);
$icon_edit = id(new PHUIIconView())
->setIconFont('fa-pencil');
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -504,7 +504,11 @@
return $preferences;
}
- public function loadEditorLink($path, $line, $callsign) {
+ public function loadEditorLink(
+ $path,
+ $line,
+ PhabricatorRepository $repository = null) {
+
$editor = $this->loadPreferences()->getPreference(
PhabricatorUserPreferences::PREFERENCE_EDITOR);
@@ -524,6 +528,12 @@
return null;
}
+ if ($repository) {
+ $callsign = $repository->getCallsign();
+ } else {
+ $callsign = null;
+ }
+
$uri = strtr($editor, array(
'%%' => '%',
'%f' => phutil_escape_uri($path),
diff --git a/src/view/widget/AphrontStackTraceView.php b/src/view/widget/AphrontStackTraceView.php
--- a/src/view/widget/AphrontStackTraceView.php
+++ b/src/view/widget/AphrontStackTraceView.php
@@ -50,14 +50,6 @@
if ($file) {
if (isset($callsigns[$lib])) {
$attrs = array('title' => $file);
- try {
- $attrs['href'] = $user->loadEditorLink(
- '/src/'.$relative,
- $part['line'],
- $callsigns[$lib]);
- } catch (Exception $ex) {
- // The database can be inaccessible.
- }
if (empty($attrs['href'])) {
$attrs['href'] = sprintf($path, $callsigns[$lib]).
str_replace(DIRECTORY_SEPARATOR, '/', $relative).

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 12, 8:00 AM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
8890811
Default Alt Text
D14931.id36083.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility