[Rt-commit] rt branch, master, updated. rt-4.4.4-371-gdc30a42cb

[? sunnavy]

The branch, master has been updated
       via  dc30a42cb95fa2286a0f32d2c74e449ce31d3b45 (commit)
      from  b37ff4320fc6e56b8b68b6818b4c8c6a469e9d71 (commit)

Summary of changes:
 share/html/Articles/Elements/IncludeArticle | 1 +
 1 file changed, 1 insertion(+)

- Log -----------------------------------------------------------------
commit dc30a42cb95fa2286a0f32d2c74e449ce31d3b45
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Sep 10 04:28:04 2019 +0800

    Handle the case where we have 2 "IncludeArticleId" inputs
    
    This could happen when the feature of queue topics is enabled, the 2
    inputs are labeled as "Include Article", "Select an Article from ...",
    respectively.
    
    Related code is in share/html/Articles/Elements/BeforeMessageBox

diff --git a/share/html/Articles/Elements/IncludeArticle b/share/html/Articles/Elements/IncludeArticle
index f27663a8b..3ecd9a2e2 100644
--- a/share/html/Articles/Elements/IncludeArticle
+++ b/share/html/Articles/Elements/IncludeArticle
@@ -48,6 +48,7 @@
 <%INIT>
 # Nothing to do if we don't get an article id
 $IncludeArticleId //= $DECODED_ARGS->{'IncludeArticleId'};
+($IncludeArticleId) = grep defined && length, @$IncludeArticleId if ref $IncludeArticleId eq 'ARRAY';
 return unless $IncludeArticleId;
 
 my $article = RT::Article->new($session{'CurrentUser'});

-----------------------------------------------------------------------