revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-23 05:50:55 +01:00
Code Issues Releases Wiki Activity

Use full URIs to link to objects from Phame blogs

Browse source 
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
This commit is contained in:
epriestley 2015-05-11 11:11:25 -07:00
parent 75fc4e763a
commit 3df64104de
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/applications/pholio/remarkup/PholioRemarkupRule.php
View file

@ -25,6 +25,10 @@ final class PholioRemarkupRule extends PhabricatorObjectRemarkupRule {
$href = $href.'/'.$id[1].'/'; $href = $href.'/'.$id[1].'/';
} }
if ($this->getEngine()->getConfig('uri.full')) {
$href = PhabricatorEnv::getURI($href);
}
return $href; return $href;
} }

7
src/infrastructure/markup/PhabricatorMarkupEngine.php
View file

@ -42,7 +42,7 @@ final class PhabricatorMarkupEngine {
private $objects = array(); private $objects = array();
private $viewer; private $viewer;
private $contextObject; private $contextObject;
private $version = 14; private $version = 15;
/* -( Markup Pipeline )---------------------------------------------------- */ /* -( Markup Pipeline )---------------------------------------------------- */
@ -337,6 +337,7 @@ final class PhabricatorMarkupEngine {
public static function newPhameMarkupEngine() { public static function newPhameMarkupEngine() {
return self::newMarkupEngine(array( return self::newMarkupEngine(array(
'macros' => false, 'macros' => false,
'uri.full' => true,
)); ));
} }
@ -349,7 +350,6 @@ final class PhabricatorMarkupEngine {
array( array(
'macros' => false, 'macros' => false,
'youtube' => false, 'youtube' => false,
)); ));
} }
@ -437,6 +437,7 @@ final class PhabricatorMarkupEngine {
'macros' => true, 'macros' => true,
'uri.allowed-protocols' => PhabricatorEnv::getEnvConfig( 'uri.allowed-protocols' => PhabricatorEnv::getEnvConfig(
'uri.allowed-protocols'), 'uri.allowed-protocols'),
'uri.full' => false,
'syntax-highlighter.engine' => PhabricatorEnv::getEnvConfig( 'syntax-highlighter.engine' => PhabricatorEnv::getEnvConfig(
'syntax-highlighter.engine'), 'syntax-highlighter.engine'),
'preserve-linebreaks' => true, 'preserve-linebreaks' => true,
@ -464,6 +465,8 @@ final class PhabricatorMarkupEngine {
'syntax-highlighter.engine', 'syntax-highlighter.engine',
$options['syntax-highlighter.engine']); $options['syntax-highlighter.engine']);
$engine->setConfig('uri.full', $options['uri.full']);
$rules = array(); $rules = array();
$rules[] = new PhutilRemarkupEscapeRemarkupRule(); $rules[] = new PhutilRemarkupEscapeRemarkupRule();
$rules[] = new PhutilRemarkupMonospaceRule(); $rules[] = new PhutilRemarkupMonospaceRule();

8
src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
View file

@ -44,7 +44,13 @@ abstract class PhabricatorObjectRemarkupRule extends PhutilRemarkupRule {
PhabricatorObjectHandle $handle, PhabricatorObjectHandle $handle,
$id) { $id) {
return $handle->getURI(); $uri = $handle->getURI();
if ($this->getEngine()->getConfig('uri.full')) {
$uri = PhabricatorEnv::getURI($uri);
}
return $uri;
} }
protected function renderObjectRefForAnyMedia ( protected function renderObjectRefForAnyMedia (