diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-06-30 01:03:13 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-06-30 01:03:13 -0700 |
| commit | f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7 (patch) | |
| tree | e5e9a077260613e6117d4697dd2985abd9b03d34 /rt/lib/RT/URI.pm | |
| parent | cf7cd8efc7095aadbdfb0cd8e7ea0e2e8b9e9085 (diff) | |
| parent | cd3eb95ed1f3dc3e04cfc2b3b405f75b3ab086da (diff) | |
merging RT 4.0.6
Diffstat (limited to 'rt/lib/RT/URI.pm')
| -rw-r--r-- | rt/lib/RT/URI.pm | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/rt/lib/RT/URI.pm b/rt/lib/RT/URI.pm index facce0413..fce04598a 100644 --- a/rt/lib/RT/URI.pm +++ b/rt/lib/RT/URI.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -49,6 +49,7 @@ package RT::URI; use strict; +use warnings; use base 'RT::Base'; use RT::URI::base; @@ -92,11 +93,10 @@ sub new { -# {{{ FromObject =head2 FromObject <Object> -Given a local object, such as an RT::Ticket or an RT::FM::Article, this routine will return a URI for +Given a local object, such as an RT::Ticket or an RT::Article, this routine will return a URI for the local object =cut @@ -109,9 +109,7 @@ sub FromObject { return $self->FromURI($obj->URI); } -# }}} -# {{{ FromURI =head2 FromURI <URI> @@ -132,10 +130,11 @@ 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 { + $self->{resolver} = RT::URI::base->new( $self->CurrentUser ); # clear resolver $RT::Logger->warning("Could not determine a URI scheme for $uri"); return (undef); } @@ -156,9 +155,7 @@ sub FromURI { } -# }}} -# {{{ _GetResolver =head2 _GetResolver <scheme> @@ -188,9 +185,7 @@ sub _GetResolver { } -# }}} -# {{{ Scheme =head2 Scheme @@ -204,8 +199,6 @@ sub Scheme { return ($self->Resolver->Scheme); } -# }}} -# {{{ URI =head2 URI @@ -219,9 +212,7 @@ sub URI { return ($self->Resolver->URI); } -# }}} -# {{{ Object =head2 Object @@ -237,9 +228,7 @@ sub Object { } -# }}} -# {{{ IsLocal =head2 IsLocal @@ -253,7 +242,6 @@ sub IsLocal { } -# }}} =head2 AsHREF |