projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT 4.0.22
[freeside.git]
/
rt
/
lib
/
RT
/
Tickets.pm
diff --git
a/rt/lib/RT/Tickets.pm
b/rt/lib/RT/Tickets.pm
index
2220a07
..
4d091ce
100755
(executable)
--- a/
rt/lib/RT/Tickets.pm
+++ b/
rt/lib/RT/Tickets.pm
@@
-1578,15
+1578,6
@@
sub _CustomFieldLimit {
}
if ( $cf && $cf->Type eq 'IPAddressRange' ) {
}
if ( $cf && $cf->Type eq 'IPAddressRange' ) {
-
- if ( $value =~ /^\s*$RE{net}{CIDR}{IPv4}{-keep}\s*$/o ) {
-
- # convert incomplete 192.168/24 to 192.168.0.0/24 format
- $value =
- join( '.', map $_ || 0, ( split /\./, $1 )[ 0 .. 3 ] ) . "/$2"
- || $value;
- }
-
my ( $start_ip, $end_ip ) =
RT::ObjectCustomFieldValue->ParseIPRange($value);
if ( $start_ip && $end_ip ) {
my ( $start_ip, $end_ip ) =
RT::ObjectCustomFieldValue->ParseIPRange($value);
if ( $start_ip && $end_ip ) {
@@
-1758,7
+1749,7
@@
sub _CustomFieldLimit {
$self->_CloseParen;
}
elsif ( $op eq '=' || $op eq '!=' || $op eq '<>' ) {
$self->_CloseParen;
}
elsif ( $op eq '=' || $op eq '!=' || $op eq '<>' ) {
- if ( length( Encode::encode
_utf8(
$value) ) < 256 ) {
+ if ( length( Encode::encode
( "UTF-8",
$value) ) < 256 ) {
$self->_SQLLimit(
ALIAS => $ObjectCFs,
FIELD => 'Content',
$self->_SQLLimit(
ALIAS => $ObjectCFs,
FIELD => 'Content',