[Jifty-commit] r3515 - in jifty/trunk: lib/Jifty

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Sun Jun 17 16:53:55 EDT 2007


Author: trs
Date: Sun Jun 17 16:53:55 2007
New Revision: 3515

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Web.pm

Log:
 r24680 at zot:  tom | 2007-06-16 16:41:16 -0400
 Allow scheme to be specified for Jifty->web->url.  This functionality was taken out during the move from "heuristics" to URI.pm, but for a non-apparent reason.


Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Sun Jun 17 16:53:55 2007
@@ -127,10 +127,6 @@
                 path => undef,
                 @_);
 
-    if ($args{'scheme'}) {
-        $self->log->error("Jifty->web->url no longer accepts a 'scheme' argument");
-    }
-
     my $uri;
 
     # Try to get a host out of the environment, useful in remote testing.
@@ -167,6 +163,10 @@
       $uri->port($port);
     }
 
+    if ( defined $args{'scheme'} ) {
+        $uri->scheme( $args{'scheme'} );
+    }
+
     if (defined $args{path}) {
       my $path = $args{path};
       # strip off leading '/' because ->canonical provides one


More information about the Jifty-commit mailing list