D7583.id17117.diff
All Users
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7583.id17117.diff
View Options

	diff --git a/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php b/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php
	--- a/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php
	+++ b/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php
	@@ -87,7 +87,7 @@
	'target' => '_blank',
	),
	pht('Profile Permalink'));
	- $result = phutil_tag(
	+ $result[] = phutil_tag(
	'iframe',
	array('src' => "/xhprof/profile/$run/?frame=true"));
	} else {
	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
	@@ -202,13 +202,16 @@
	PhabricatorMarkupInterface $object,
	$field) {

	- $custom = array_merge(
	- self::loadCustomInlineRules(),
	- self::loadCustomBlockRules());
	-
	- $custom = mpull($custom, 'getRuleVersion', null);
	- ksort($custom);
	- $custom = PhabricatorHash::digestForIndex(serialize($custom));
	+ static $custom;
	+ if ($custom === null) {
	+ $custom = array_merge(
	+ self::loadCustomInlineRules(),
	+ self::loadCustomBlockRules());
	+
	+ $custom = mpull($custom, 'getRuleVersion', null);
	+ ksort($custom);
	+ $custom = PhabricatorHash::digestForIndex(serialize($custom));
	+ }

	return $object->getMarkupFieldKey($field).'@'.$this->version.'@'.$custom;
	}