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

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sat Jul 22 19:26:09 2006
New Revision: 1648

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

Log:
 r14349 at pinglin:  jesse | 2006-07-22 16:18:11 -0700
 * Dispatcher fixes to deal with the better canonicalization we started doing in
   0.60707


Modified: jifty/trunk/lib/Jifty/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Dispatcher.pm	(original)
+++ jifty/trunk/lib/Jifty/Dispatcher.pm	Sat Jul 22 19:26:09 2006
@@ -722,26 +722,10 @@
     $path = "$self->{cwd}/$path" unless $path =~ m{^/};
 
     # When we're requesting a directory, go looking for the index.html
-    if ( $path =~ m{/$} and $self->template_exists( $path . "/index.html" ) )
-    {
-
+    if ( $self->template_exists( $path . "/index.html" ) ) {
         $path .= "/index.html";
     }
 
-    # Redirect to directory (and then index) if they requested
-    # the directory itself
-
-    # XXX TODO, we should search all component roots
-
-    if ($path !~ m{/$}
-        and -d Jifty::Util->absolute_path(
-            Jifty->config->framework('Web')->{'TemplateRoot'} . $path
-        )
-        )
-    {
-        $self->_do_show( $path . "/" );
-    }
-
     my $abs_template_path = Jifty::Util->absolute_path(
         Jifty->config->framework('Web')->{'TemplateRoot'} . $path );
     my $abs_root_path = Jifty::Util->absolute_path(