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

Always install the "icon" and "emoji" remarkup rules

Browse source 
Summary: Ref T10394. Currently, these rules are only active if the Macro application is installed. Instead, install them unconditionally.

Test Plan:
  - Used `{icon camera}` with Macro installed and uninstalled.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10394

Differential Revision: https://secure.phabricator.com/D15311
This commit is contained in:
epriestley 2016-02-19 11:43:19 -08:00
parent 4e40b17aca
commit 50f910ce67
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/applications/macro/application/PhabricatorMacroApplication.php
View file

@ -42,13 +42,6 @@ final class PhabricatorMacroApplication extends PhabricatorApplication {
); );
} }
public function getRemarkupRules() {
return array(
new PhabricatorIconRemarkupRule(),
new PhabricatorEmojiRemarkupRule(),
);
}
protected function getCustomCapabilities() { protected function getCustomCapabilities() {
return array( return array(
PhabricatorMacroManageCapability::CAPABILITY => array( PhabricatorMacroManageCapability::CAPABILITY => array(

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

@ -492,6 +492,9 @@ final class PhabricatorMarkupEngine extends Phobject {
$rules[] = new PhabricatorYoutubeRemarkupRule(); $rules[] = new PhabricatorYoutubeRemarkupRule();
} }
$rules[] = new PhabricatorIconRemarkupRule();
$rules[] = new PhabricatorEmojiRemarkupRule();
$applications = PhabricatorApplication::getAllInstalledApplications(); $applications = PhabricatorApplication::getAllInstalledApplications();
foreach ($applications as $application) { foreach ($applications as $application) {
foreach ($application->getRemarkupRules() as $rule) { foreach ($application->getRemarkupRules() as $rule) {