[Rt-commit] rt branch, 4.0/loose-cf-name-in-rest, updated. rt-4.0.5-61-g5243430

? sunnavy sunnavy at bestpractical.com
Mon Feb 13 12:55:53 EST 2012


The branch, 4.0/loose-cf-name-in-rest has been updated
       via  5243430d16282e96afcd7284fc0941575cf8973a (commit)
      from  bfb31036378a087879bcfead1ccdb1a9e7b04015 (commit)

Summary of changes:
 bin/rt.in                |    2 +-
 lib/RT/Interface/REST.pm |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 5243430d16282e96afcd7284fc0941575cf8973a
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Feb 14 01:31:10 2012 +0800

    we use "," to split fields, so "," can't be allowed

diff --git a/bin/rt.in b/bin/rt.in
index e5714aa..640c7b4 100755
--- a/bin/rt.in
+++ b/bin/rt.in
@@ -119,7 +119,7 @@ sub DEBUG { warn @_ if $config{debug} >= shift }
 # (XXX: Ask Autrijus how i18n changes these definitions.)
 
 my $name    = '[\w.-]+';
-my $CF_name = '.+';
+my $CF_name = '[^,]+';
 my $field   = '(?i:[a-z][a-z0-9_-]*|C(?:ustom)?F(?:ield)?-'.$CF_name.'|CF\.\{'.$CF_name.'\})';
 my $label   = '[a-zA-Z0-9 at _.+-]+';
 my $labels  = "(?:$label,)*$label";
diff --git a/lib/RT/Interface/REST.pm b/lib/RT/Interface/REST.pm
index eadc6d4..87bf8cd 100644
--- a/lib/RT/Interface/REST.pm
+++ b/lib/RT/Interface/REST.pm
@@ -58,7 +58,7 @@ sub custom_field_spec {
     my $self    = shift;
     my $capture = shift;
 
-    my $CF_name = '.+';
+    my $CF_name = '[^,]+';
     $CF_name = '(' . $CF_name . ')' if $capture;
 
     my $new_style = 'CF\.\{'.$CF_name.'\}';

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


More information about the Rt-commit mailing list