+6

src/applications/countdown/application/PhabricatorApplicationCountdown.php

reviewed

··· 29 29 return self::GROUP_UTILITIES; 30 30 } 31 31 32 32 + public function getRemarkupRules() { 33 33 + return array( 34 34 + new PhabricatorCountdownRemarkupRule(), 35 35 + ); 36 36 + } 37 37 + 32 38 public function getRoutes() { 33 39 return array( 34 40 '/countdown/' => array(

+6

src/applications/diviner/application/PhabricatorApplicationDiviner.php

reviewed

··· 39 39 return self::GROUP_COMMUNICATION; 40 40 } 41 41 42 42 + public function getRemarkupRules() { 43 43 + return array( 44 44 + new DivinerRemarkupRuleSymbol(), 45 45 + ); 46 46 + } 47 47 + 42 48 public function buildMainMenuItems( 43 49 PhabricatorUser $user, 44 50 PhabricatorController $controller = null) {

+7

src/applications/files/application/PhabricatorApplicationFiles.php

reviewed

··· 34 34 return false; 35 35 } 36 36 37 37 + public function getRemarkupRules() { 38 38 + return array( 39 39 + new PhabricatorRemarkupRuleEmbedFile(), 40 40 + ); 41 41 + } 42 42 + 43 43 + 37 44 public function getRoutes() { 38 45 return array( 39 46 '/F(?P<id>[1-9]\d*)' => 'PhabricatorFileShortcutController',

+6

src/applications/people/application/PhabricatorApplicationPeople.php

reviewed

··· 54 54 ); 55 55 } 56 56 57 57 + public function getRemarkupRules() { 58 58 + return array( 59 59 + new PhabricatorRemarkupRuleMention(), 60 60 + ); 61 61 + } 62 62 + 57 63 public function buildMainMenuItems( 58 64 PhabricatorUser $user, 59 65 PhabricatorController $controller = null) {

+6

src/applications/phriction/application/PhabricatorApplicationPhriction.php

reviewed

··· 22 22 return "\xE2\x9A\xA1"; 23 23 } 24 24 25 25 + public function getRemarkupRules() { 26 26 + return array( 27 27 + new PhrictionRemarkupRule(), 28 28 + ); 29 29 + } 30 30 + 25 31 public function getRoutes() { 26 32 return array( 27 33 // Match "/w/" with slug "/".

+9 -3

src/applications/phriction/remarkup/PhrictionRemarkupRule.php

reviewed

··· 6 6 final class PhrictionRemarkupRule 7 7 extends PhutilRemarkupRule { 8 8 9 9 + public function getPriority() { 10 10 + return 350.0; 11 11 + } 12 12 + 9 13 public function apply($text) { 10 14 return preg_replace_callback( 11 15 '@\B\\[\\[([^|\\]]+)(?:\\|([^\\]]+))?\\]\\]\B@U', ··· 17 21 18 22 $link = trim($matches[1]); 19 23 $name = trim(idx($matches, 2, $link)); 20 20 - $name = explode('/', trim($name, '/')); 21 21 - $name = end($name); 24 24 + if (empty($matches[2])) { 25 25 + $name = explode('/', trim($name, '/')); 26 26 + $name = end($name); 27 27 + } 22 28 23 29 $uri = new PhutilURI($link); 24 30 $slug = $uri->getPath(); 25 31 $fragment = $uri->getFragment(); 26 32 $slug = PhabricatorSlug::normalize($slug); 27 33 $slug = PhrictionDocument::getSlugURI($slug); 28 28 - $href = (string) id(new PhutilURI($slug))->setFragment($fragment); 34 34 + $href = (string)id(new PhutilURI($slug))->setFragment($fragment); 29 35 30 36 if ($this->getEngine()->getState('toc')) { 31 37 $text = $name;

+3 -17

src/infrastructure/markup/PhabricatorMarkupEngine.php

reviewed

··· 457 457 } 458 458 459 459 $rules[] = new PhutilRemarkupRuleHyperlink(); 460 460 - $rules[] = new PhrictionRemarkupRule(); 461 461 - 462 462 - $rules[] = new PhabricatorRemarkupRuleEmbedFile(); 463 463 - $rules[] = new PhabricatorCountdownRemarkupRule(); 464 460 465 461 if ($options['macros']) { 466 462 $rules[] = new PhabricatorRemarkupRuleImageMacro(); 467 463 $rules[] = new PhabricatorRemarkupRuleMeme(); 468 464 } 469 465 470 470 - $rules[] = new DivinerRemarkupRuleSymbol(); 471 471 - 472 472 - $rules[] = new PhabricatorRemarkupRuleMention(); 473 473 - 474 466 $rules[] = new PhutilRemarkupRuleBold(); 475 467 $rules[] = new PhutilRemarkupRuleItalic(); 476 468 $rules[] = new PhutilRemarkupRuleDel(); ··· 485 477 $blocks[] = new PhutilRemarkupEngineRemarkupNoteBlockRule(); 486 478 $blocks[] = new PhutilRemarkupEngineRemarkupTableBlockRule(); 487 479 $blocks[] = new PhutilRemarkupEngineRemarkupSimpleTableBlockRule(); 488 488 - $blocks[] = new PhutilRemarkupEngineRemarkupDefaultBlockRule(); 489 480 490 481 $custom_block_rule_classes = $options['custom-block']; 491 482 if ($custom_block_rule_classes) { ··· 494 485 } 495 486 } 496 487 488 488 + $blocks[] = new PhutilRemarkupEngineRemarkupDefaultBlockRule(); 489 489 + 497 490 foreach ($blocks as $block) { 498 498 - if ($block instanceof PhutilRemarkupEngineRemarkupLiteralBlockRule) { 499 499 - $literal_rules = array(); 500 500 - $literal_rules[] = new PhutilRemarkupRuleLinebreaks(); 501 501 - $block->setMarkupRules($literal_rules); 502 502 - } else if ( 503 503 - !($block instanceof PhutilRemarkupEngineRemarkupCodeBlockRule)) { 504 504 - $block->setMarkupRules($rules); 505 505 - } 491 491 + $block->setMarkupRules($rules); 506 492 } 507 493 508 494 $engine->setBlockRules($blocks);