diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php index d34a635b73..3a1110200f 100644 --- a/src/applications/config/controller/PhabricatorConfigEditController.php +++ b/src/applications/config/controller/PhabricatorConfigEditController.php @@ -466,6 +466,9 @@ final class PhabricatorConfigEditController if ($value === null) { $value = phutil_tag('em', array(), pht('(empty)')); } else { + if (is_array($value)) { + $value = implode("\n", $value); + } $value = phutil_escape_html_newlines($value); } diff --git a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php index 8853a55425..7fff476070 100644 --- a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php +++ b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php @@ -75,6 +75,9 @@ final class PhabricatorDiffusionConfigOptions '%BUGID%')), $this->newOption('bugtraq.logregex', 'list', array()) ->addExample(array('\B#([1-9]\d*)\b'), pht('Issue #123')) + ->addExample( + array('[Ii]ssues?:?(\s*,?\s*#\d+)+', '(\d+)'), + pht('Issue #123, #456')) ->addExample(array('(?setDescription(pht( 'Regular expression to link external bug tracker. See '.