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

Restore merge of phutil_tag.

Browse Source
This commit is contained in:
epriestley
2013-02-13 14:50:15 -08:00
parent 73cce6e131
commit ef7f16180c
264 changed files with 1690 additions and 1716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/infrastructure/markup/PhabricatorMarkupEngine.php
View File

@@ -41,7 +41,7 @@ final class PhabricatorMarkupEngine {
private $objects = array();
private $viewer;
private $version = 2;
private $version = 3;
/* -( Markup Pipeline )---------------------------------------------------- */
@@ -160,7 +160,7 @@ final class PhabricatorMarkupEngine {
"Call process() before getOutput().");
}
return new PhutilSafeHTML($this->objects[$key]['output']);
return $this->objects[$key]['output'];
}
@@ -424,7 +424,6 @@ final class PhabricatorMarkupEngine {
$rules[] = new PhabricatorRemarkupRuleMention();
$rules[] = new PhutilRemarkupRuleEscapeHTML();
$rules[] = new PhutilRemarkupRuleBold();
$rules[] = new PhutilRemarkupRuleItalic();
$rules[] = new PhutilRemarkupRuleDel();
@@ -450,7 +449,6 @@ final class PhabricatorMarkupEngine {
foreach ($blocks as $block) {
if ($block instanceof PhutilRemarkupEngineRemarkupLiteralBlockRule) {
$literal_rules = array();
$literal_rules[] = new PhutilRemarkupRuleEscapeHTML();
$literal_rules[] = new PhutilRemarkupRuleLinebreaks();
$block->setMarkupRules($literal_rules);
} else if (