From ce62632e15f545f4a2affb2301300288c893137a Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 6 Aug 2013 09:29:22 -0700
Subject: [PATCH] Add example for bugtraq.logregex with two parts

Summary: Also fix displaying array examples.

Test Plan: Used it in `linkBugtraq()`.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T3620

Differential Revision: https://secure.phabricator.com/D6667
---
 .../config/controller/PhabricatorConfigEditController.php      | 3 +++
 .../diffusion/config/PhabricatorDiffusionConfigOptions.php     | 3 +++
 2 files changed, 6 insertions(+)

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<string>', 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('(?<!#)\b(T[1-9]\d*)\b'), pht('Task T123'))
         ->setDescription(pht(
           'Regular expression to link external bug tracker. See '.