mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-12-15 05:49 am

[dw-free] Template Toolikt / Routing System

[commit: http://hg.dwscoalition.org/dw-free/rev/1b0b57545725]

http://bugs.dwscoalition.org/show_bug.cgi?id=2054

Andrea had this right but I 'optimized' the code and broke it. OK is 0. My
bad.

Patch by [staff profile] mark.

Files modified:
  • cgi-bin/Apache/LiveJournal.pm
--------------------------------------------------------------------------------
diff -r fd661f512cff -r 1b0b57545725 cgi-bin/Apache/LiveJournal.pm
--- a/cgi-bin/Apache/LiveJournal.pm	Tue Dec 15 04:00:47 2009 +0000
+++ b/cgi-bin/Apache/LiveJournal.pm	Tue Dec 15 05:49:51 2009 +0000
@@ -645,8 +645,8 @@ sub trans
         return DECLINED if $uuri eq "/favicon.ico";
 
         # see if there is a modular handler for this URI
-        my $ret = LJ::URI->handle($uuri, $r) ||
-                  DW::Routing::Apache2->call( $r, username => $user );
+        my $ret = LJ::URI->handle($uuri, $r);
+        $ret = DW::Routing::Apache2->call( $r, username => $user ) unless defined $ret;
         return $ret if defined $ret;
 
         if ($uuri eq "/__setdomsess") {
@@ -942,8 +942,8 @@ sub trans
     }
 
     # see if there is a modular handler for this URI
-    my $ret = LJ::URI->handle($uri, $r) ||
-              DW::Routing::Apache2->call( $r );
+    my $ret = LJ::URI->handle($uri, $r);
+    $ret = DW::Routing::Apache2->call( $r ) unless defined $ret;
     return $ret if defined $ret;
 
     # customview (get an S1 journal by number)
--------------------------------------------------------------------------------