summaryrefslogtreecommitdiff
path: root/rt/share/html/REST/1.0/dhandler
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2013-06-04 00:21:24 -0700
committerIvan Kohler <ivan@freeside.biz>2013-06-04 00:21:24 -0700
commit679854b8bbc65d112071111bbd7f34a6a481fb30 (patch)
treedda0862fdf7853f4f61e4cf155c8bbc93768c994 /rt/share/html/REST/1.0/dhandler
parent9b328d940af56b9924a342192ebb0790478fa705 (diff)
RT 4.0.13
Diffstat (limited to 'rt/share/html/REST/1.0/dhandler')
-rwxr-xr-xrt/share/html/REST/1.0/dhandler6
1 files changed, 3 insertions, 3 deletions
diff --git a/rt/share/html/REST/1.0/dhandler b/rt/share/html/REST/1.0/dhandler
index a6fc89724..49a28c636 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-2013 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)) {