[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.5-123-g15a1504

[Ruslan Zakirov]

The branch, 3.8-trunk has been updated
       via  15a1504c79025598fae2c0de4969bc23b1969cbf (commit)
      from  c0ba2a35099a35194407b191370b86e7547e8c85 (commit)

Summary of changes:
 share/html/Elements/CollectionAsTable/ParseFormat |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 15a1504c79025598fae2c0de4969bc23b1969cbf
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Sep 17 17:13:10 2009 +0400

    * fix newline and nbsp in format strings

diff --git a/share/html/Elements/CollectionAsTable/ParseFormat b/share/html/Elements/CollectionAsTable/ParseFormat
index f74b884..d58246f 100644
--- a/share/html/Elements/CollectionAsTable/ParseFormat
+++ b/share/html/Elements/CollectionAsTable/ParseFormat
@@ -75,6 +75,9 @@ while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) {
         $colref->{'last_attribute'} = $colref->{'attribute'} = ''
             unless defined $colref->{'attribute'};
     }
+    elsif ( $col =~ /^__(NEWLINE|NBSP)__$/ || $col =~ /^(NEWLINE|NBSP)$/ ) {
+        $colref->{'title'} = $1;
+    }
     elsif ( $col =~ /__(.*?)__/io ) {
         my @subcols;
         while ( $col =~ s/^(.*?)__(.*?)__//o ) {
@@ -87,9 +90,6 @@ while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) {
         $colref->{'attribute'} = $colref->{'last_attribute'}
             unless defined $colref->{'attribute'};
     }
-    elsif ( $col eq 'NEWLINE' || $col eq 'NBSP' ) {
-        $colref->{'title'} = $col;
-    }
     else {
         $colref->{'output'} = [ "__" . $col . "__" ];
         $colref->{'last_attribute'} = $col;

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