[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.2-233-g9640e50c0

[? sunnavy]

The branch, 4.4-trunk has been updated
       via  9640e50c08d2701e676104f452952b5e27dcea16 (commit)
       via  7de33c08da6136b60026c01c2895e019308d7494 (commit)
      from  ca3cf1a13a9c6561257f5965775586d2bec304e8 (commit)

Summary of changes:
 share/html/Articles/Article/Elements/Preformatted | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 9640e50c08d2701e676104f452952b5e27dcea16
Merge: ca3cf1a13 7de33c08d
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue May 8 01:11:20 2018 +0800

    Merge branch '4.4/update-article-postfix-loops-variable' into 4.4-trunk

diff --cc share/html/Articles/Article/Elements/Preformatted
index 997c4cd29,bb70538cd..4d4f3ed21
--- a/share/html/Articles/Article/Elements/Preformatted
+++ b/share/html/Articles/Article/Elements/Preformatted
@@@ -84,10 -84,15 +84,15 @@@
  % }
  <%init>
  my $class = $Article->ClassObj;
 -my %include = (Name => 1, Summary => 1);
 +my %include = (Name => 1, Summary => 1, EscapeHTML => 1);
  my $cfs = $class->ArticleCustomFields;
- $include{"CF-Title-".$_->Id} = $include{"CF-Value-".$_->Id} = 1 while $_ = $cfs->Next;
- $include{$_} = not $class->FirstAttribute("Skip-$_") for keys %include;
+ while ( my $cf = $cfs->Next ) {
+     $include{"CF-Title-" . $cf->Id} = 1;
+     $include{"CF-Value-" . $cf->Id} = 1;
+ }
+ foreach my $key ( keys %include ) {
+     $include{$key} = not $class->FirstAttribute("Skip-$key");
+ }
  
  my $get_content = sub {
      my $value = shift;

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