X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rt%2Fshare%2Fhtml%2FREST%2F1.0%2Fdhandler;h=2243376f50554605cda063911b57cf840a738f9b;hb=919e930aa9279b3c5cd12b593889cd6de79d67bf;hp=a6fc8972413441f0ab3ef6f8f660c1ede142375e;hpb=f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7;p=freeside.git

diff --git a/rt/share/html/REST/1.0/dhandler b/rt/share/html/REST/1.0/dhandler
index a6fc89724..2243376f5 100755
--- a/rt/share/html/REST/1.0/dhandler
+++ b/rt/share/html/REST/1.0/dhandler
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -62,7 +62,7 @@ my $object = $m->dhandler_arg;
 
 my $name   = qr{[\w.-]+};
 my $list   = '(?:(?:\d+-)?\d+,)*(?:\d+-)?\d+';
-my $label  = '[a-zA-Z0-9@_.+-]+';
+my $label   = '[^,\\/]+';
 my $field  = RT::Interface::REST->field_spec;
 my $labels = "(?:$label,)*$label";
 
@@ -242,7 +242,7 @@ foreach $object (@objects) {
         $handler = "Forms/$type/$attr";
 
         unless ($m->comp_exists($handler)) {
-            $args = "$attr/$args";
+            $args = defined $args ? "$attr/$args" : $attr;
             $handler = "Forms/$type/default";
 
             unless ($m->comp_exists($handler)) {