diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 296523efa0..3fc30cc1b5 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -351,7 +351,7 @@ return array( 'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761', 'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18', 'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de', - 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'dc9fb293', + 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'a88a26cc', 'rsrc/js/application/conpherence/behavior-menu.js' => '869e3445', 'rsrc/js/application/conpherence/behavior-pontificate.js' => '86df5915', 'rsrc/js/application/conpherence/behavior-widget-pane.js' => '40b1ff90', @@ -584,7 +584,7 @@ return array( 'javelin-behavior-diffusion-locate-file' => '6d3e1947', 'javelin-behavior-diffusion-pull-lastmodified' => '2b228192', 'javelin-behavior-doorkeeper-tag' => 'e5822781', - 'javelin-behavior-durable-column' => 'dc9fb293', + 'javelin-behavior-durable-column' => 'a88a26cc', 'javelin-behavior-error-log' => '6882e80a', 'javelin-behavior-fancy-datepicker' => 'c51ae228', 'javelin-behavior-global-drag-and-drop' => '07f199d8', @@ -1609,6 +1609,15 @@ return array( 'javelin-stratcom', 'javelin-dom', ), + 'a88a26cc' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-stratcom', + 'javelin-scrollbar', + 'javelin-quicksand', + 'phabricator-keyboard-shortcut', + 'javelin-behavior-conpherence-widget-pane', + ), 'a8d8459d' => array( 'javelin-behavior', 'javelin-dom', @@ -1782,15 +1791,6 @@ return array( 'javelin-dom', 'phabricator-busy', ), - 'dc9fb293' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-stratcom', - 'javelin-scrollbar', - 'javelin-quicksand', - 'phabricator-keyboard-shortcut', - 'javelin-behavior-conpherence-widget-pane', - ), 'de2e896f' => array( 'javelin-behavior', 'javelin-dom', diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php index 1bcf9e213d..41db909125 100644 --- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php +++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php @@ -186,7 +186,9 @@ abstract class PhabricatorApplicationTransactionEditor return $this->unmentionablePHIDMap; } - protected function shouldEnableMentions() { + protected function shouldEnableMentions( + PhabricatorLiskDAO $object, + array $xactions) { return true; }