@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Use full URIs to link to objects from Phame blogs
Summary: Fixes T6299.
Test Plan: Viewed live blog, saw full URIs.
Reviewers: btrahan
Reviewed By: btrahan
Subscribers: johnny-bit, epriestley
Maniphest Tasks: T6299
Differential Revision: https://secure.phabricator.com/D12793
+16
-3
+4
src/applications/pholio/remarkup/PholioRemarkupRule.php
+4
src/applications/pholio/remarkup/PholioRemarkupRule.php
+5
-2
src/infrastructure/markup/PhabricatorMarkupEngine.php
+5
-2
src/infrastructure/markup/PhabricatorMarkupEngine.php
···
42
42
private $objects = array();
43
43
private $viewer;
44
44
private $contextObject;
45
-
private $version = 14;
45
+
private $version = 15;
46
46
47
47
48
48
/* -( Markup Pipeline )---------------------------------------------------- */
···
337
337
public static function newPhameMarkupEngine() {
338
338
return self::newMarkupEngine(array(
339
339
'macros' => false,
340
+
'uri.full' => true,
340
341
));
341
342
}
342
343
···
349
350
array(
350
351
'macros' => false,
351
352
'youtube' => false,
352
-
353
353
));
354
354
}
355
355
···
437
437
'macros' => true,
438
438
'uri.allowed-protocols' => PhabricatorEnv::getEnvConfig(
439
439
'uri.allowed-protocols'),
440
+
'uri.full' => false,
440
441
'syntax-highlighter.engine' => PhabricatorEnv::getEnvConfig(
441
442
'syntax-highlighter.engine'),
442
443
'preserve-linebreaks' => true,
···
463
464
$engine->setConfig(
464
465
'syntax-highlighter.engine',
465
466
$options['syntax-highlighter.engine']);
467
+
468
+
$engine->setConfig('uri.full', $options['uri.full']);
466
469
467
470
$rules = array();
468
471
$rules[] = new PhutilRemarkupEscapeRemarkupRule();
+7
-1
src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
+7
-1
src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
···
44
44
PhabricatorObjectHandle $handle,
45
45
$id) {
46
46
47
-
return $handle->getURI();
47
+
$uri = $handle->getURI();
48
+
49
+
if ($this->getEngine()->getConfig('uri.full')) {
50
+
$uri = PhabricatorEnv::getURI($uri);
51
+
}
52
+
53
+
return $uri;
48
54
}
49
55
50
56
protected function renderObjectRefForAnyMedia (