[freeside-commits] freeside/rt/lib/RT/URI base.pm, 1.1.1.3, 1.1.1.3.4.1 fsck_com_rt.pm, 1.1.1.4, 1.1.1.4.4.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/rt/lib/RT/URI
In directory wavetail.420.am:/tmp/cvs-serv10370/lib/RT/URI

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	base.pm fsck_com_rt.pm 
Log Message:
merge in rt 3.4.6.  *gulp*!

Index: base.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/lib/RT/URI/base.pm,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.4.1
diff -u -d -r1.1.1.3 -r1.1.1.3.4.1
--- base.pm	15 Oct 2005 09:11:11 -0000	1.1.1.3
+++ base.pm	3 Mar 2008 23:07:54 -0000	1.1.1.3.4.1
@@ -81,12 +81,8 @@
     my $self = shift;
     my $obj = shift;
     $self->{'uri'} = "unknown-object:".ref($obj);
-
-
 }
 
-
-
 sub ParseURI { 
     my $self = shift;
     my $uri = shift;

Index: fsck_com_rt.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/lib/RT/URI/fsck_com_rt.pm,v
retrieving revision 1.1.1.4
retrieving revision 1.1.1.4.4.1
diff -u -d -r1.1.1.4 -r1.1.1.4.4.1
--- fsck_com_rt.pm	15 Oct 2005 09:11:11 -0000	1.1.1.4
+++ fsck_com_rt.pm	3 Mar 2008 23:07:55 -0000	1.1.1.4.4.1
@@ -128,7 +128,7 @@
 sub URIForObject {
     my $self = shift;
     my $obj = shift;
-    return ($self->LocalURIPrefix."/".$self->ObjectType($obj)."/". $obj->Id);
+    return ($self->LocalURIPrefix ."/". $self->ObjectType($obj) ."/". $obj->Id);
 }
 
 
@@ -143,12 +143,12 @@
     my $self = shift;
     my $uri  = shift;
 
-    if ( $uri =~ /^(\d+)$/ ) {
+    if ( $uri =~ /^\d+$/ ) {
         my $ticket = RT::Ticket->new( $self->CurrentUser );
-        $ticket->Load($uri);
+        $ticket->Load( $uri );
         $self->{'uri'} = $ticket->URI;
         $self->{'object'} = $ticket;
-        return($ticket->id);
+        return ($ticket->id);
     }
     else {
         $self->{'uri'} = $uri;
@@ -156,9 +156,8 @@
 
     #If it's a local URI, load the ticket object and return its URI
     if ( $self->IsLocal ) {
-
         my $local_uri_prefix = $self->LocalURIPrefix;
-        if ( $self->{'uri'} =~ /^$local_uri_prefix\/(.*?)\/(\d+)$/i ) {
+        if ( $self->{'uri'} =~ /^\Q$local_uri_prefix\E\/(.*?)\/(\d+)$/i ) {
             my $type = $1;
             my $id   = $2;
 
@@ -192,9 +191,9 @@
 
 sub IsLocal {
 	my $self = shift;
-        my $local_uri_prefix = $self->LocalURIPrefix;
-	if ($self->{'uri'} =~ /^$local_uri_prefix/i) {
-		return 1;
+    my $local_uri_prefix = $self->LocalURIPrefix;
+    if ( $self->{'uri'} =~ /^\Q$local_uri_prefix/i ) {
+        return 1;
     }
 	else {
 		return undef;