From: John Napiorkowski <jjnapiork@cpan.org>
Date: Mon, 25 Mar 2013 14:39:43 +0000 (-0400)
Subject: do something rational in the case where you call $app->uri_for
X-Git-Tag: 5.90030~16
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=f9451270ac09ec79f7185213288c927501010d1f

do something rational in the case where you call $app->uri_for
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 43bda89..c2e925b 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1341,10 +1341,14 @@ sub uri_for {
     # join args with '/', or a blank string
     my $args = join('/', grep { defined($_) } @args);
     $args =~ s/\?/%3F/g; # STUPID STUPID SPECIAL CASE
-    $args =~ s!^/+!!;
-    my $base = $c->req->base;
-    my $class = ref($base);
-    $base =~ s{(?<!/)$}{/};
+    $args =~ s!^/+!!i;
+
+    my ($base, $class) = ('/', 'URI::_generic');
+    if(blessed($c)) {
+      $base = $c->req->base;
+      $class = ref($base);
+      $base =~ s{(?<!/)$}{/};
+    }
 
     my $query = '';