improve deferred prorate billing with period > 1 month, #22311

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

diff --git a/rt/lib/RT/URI.pm b/rt/lib/RT/URI.pm
index 1e0c036..03489ad 100644 (file)
--- a/rt/lib/RT/URI.pm
+++ b/rt/lib/RT/URI.pm
@@ -132,7 +132,7 @@ sub FromURI {
     # Special case: integers passed in as URIs must be ticket ids
     if ($uri =~ /^(\d+)$/) {
        $scheme = "fsck.com-rt";
-    } elsif ($uri =~ /^((?:\w|\.|-)+?):/) {
+    } elsif ($uri =~ /^((?!javascript|data)(?:\w|\.|-)+?):/i) {
        $scheme = $1;
     }
     else {
@@ -278,9 +278,6 @@ sub Resolver {
     return ($self->{'resolver'});
 }
 
-eval "require RT::URI_Vendor";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI_Vendor.pm});
-eval "require RT::URI_Local";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI_Local.pm});
+RT::Base->_ImportOverlays();
 
 1;