D15311.id36934.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15311.id36934.diff
View Options

	diff --git a/src/applications/macro/application/PhabricatorMacroApplication.php b/src/applications/macro/application/PhabricatorMacroApplication.php
	--- a/src/applications/macro/application/PhabricatorMacroApplication.php
	+++ b/src/applications/macro/application/PhabricatorMacroApplication.php
	@@ -42,13 +42,6 @@
	);
	}

	- public function getRemarkupRules() {
	- return array(
	- new PhabricatorIconRemarkupRule(),
	- new PhabricatorEmojiRemarkupRule(),
	- );
	- }
	-
	protected function getCustomCapabilities() {
	return array(
	PhabricatorMacroManageCapability::CAPABILITY => array(
	diff --git a/src/infrastructure/markup/PhabricatorMarkupEngine.php b/src/infrastructure/markup/PhabricatorMarkupEngine.php
	--- a/src/infrastructure/markup/PhabricatorMarkupEngine.php
	+++ b/src/infrastructure/markup/PhabricatorMarkupEngine.php
	@@ -492,6 +492,9 @@
	$rules[] = new PhabricatorYoutubeRemarkupRule();
	}

	+ $rules[] = new PhabricatorIconRemarkupRule();
	+ $rules[] = new PhabricatorEmojiRemarkupRule();
	+
	$applications = PhabricatorApplication::getAllInstalledApplications();
	foreach ($applications as $application) {
	foreach ($application->getRemarkupRules() as $rule) {