diff options
Diffstat (limited to 'rt/html/Elements/CollectionAsTable/ParseFormat')
| -rw-r--r-- | rt/html/Elements/CollectionAsTable/ParseFormat | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/rt/html/Elements/CollectionAsTable/ParseFormat b/rt/html/Elements/CollectionAsTable/ParseFormat index 57434efe2..227076093 100644 --- a/rt/html/Elements/CollectionAsTable/ParseFormat +++ b/rt/html/Elements/CollectionAsTable/ParseFormat @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# <jesse@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -48,7 +50,7 @@ $Format </%ARGS> <%init> -use Regexp::Common; +use Regexp::Common qw/delimited/; my @Columns; while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) { @@ -59,7 +61,9 @@ while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) { substr($col,-1,1) = ""; } - my $colref; + my $colref = { + title => '', + }; if ( $col =~ s!/STYLE:([^/]+)!!io ) { $colref->{'style'} = $1; @@ -88,7 +92,7 @@ while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) { $colref->{'attribute'} = $col; } - if ( !$colref->{'title'} && grep { /^__(.*?)__$/io } + if ( !$colref->{'title'} && grep { /^__(.+?)__$/io } @{ $colref->{'output'} } ) { $colref->{'title'} = $1; |