import rt 3.4.4

[freeside.git] / rt / lib / RT / Link_Overlay.pm

diff --git a/rt/lib/RT/Link_Overlay.pm b/rt/lib/RT/Link_Overlay.pm
index ef0347a..28143cf 100644 (file)
--- a/rt/lib/RT/Link_Overlay.pm
+++ b/rt/lib/RT/Link_Overlay.pm
@@ -1,8 +1,8 @@
-# {{{ BEGIN BPS TAGGED BLOCK
+# BEGIN BPS TAGGED BLOCK {{{
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,8 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# }}} END BPS TAGGED BLOCK
+# END BPS TAGGED BLOCK }}}
+
 =head1 NAME
 
   RT::Link - an RT Link object
@@ -76,6 +77,9 @@ ok (UNIVERSAL::isa($link, 'DBIx::SearchBuilder::Record'));
 
 =cut
 
+
+package RT::Link;
+
 use strict;
 no warnings qw(redefine);
 
@@ -103,23 +107,31 @@ sub Create {
     my $base = RT::URI->new( $self->CurrentUser );
     $base->FromURI( $args{'Base'} );
 
-    unless ( $base->Resolver and $base->Scheme ) {
-        $RT::Logger->warning( "$self couldn't resolve base:'"
-                              . $args{'Base'} . " - "
-                              . "' into a URI\n" );
+    unless ( $base->Resolver && $base->Scheme ) {
+       my $msg = $self->loc("Couldn't resolve base '[_1]' into a URI.", 
+                            $args{'Base'});
+        $RT::Logger->warning( "$self $msg\n" );
 
-        return (undef);
+       if (wantarray) {
+           return(undef, $msg);
+       } else {
+           return (undef);
+       }
     }
 
     my $target = RT::URI->new( $self->CurrentUser );
     $target->FromURI( $args{'Target'} );
 
     unless ( $target->Resolver ) {
-        $RT::Logger->warning( "$self couldn't resolve target:'"
-                              . $args{'Target'} . " - "
-                              . "' into a URI\n" );
-
-        return (undef);
+       my $msg = $self->loc("Couldn't resolve target '[_1]' into a URI.", 
+                            $args{'Target'});
+        $RT::Logger->warning( "$self $msg\n" );
+
+       if (wantarray) {
+           return(undef, $msg);
+       } else {
+           return (undef);
+       }
     }
 
     my $base_id   = 0;