[z3-checkins] r41939 - z3/deliverance/DeliveranceVHoster/trunk/dvhoster

[ianb at codespeak.net]

Author: ianb
Date: Fri Apr  6 17:19:46 2007
New Revision: 41939

Modified:
   z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py
Log:
Move rewrite_links into the should_theme_uri conditional block, just like theming

Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py	Fri Apr  6 17:19:46 2007
@@ -115,15 +115,15 @@
             remote=remote_uri,
             force_host=True)
 
-        if self.rewrite_links:
-            app = relocateresponse.RelocateMiddleware(
-                app, old_href=remote_uri)
-
-        rule_uri = construct_url(
-            environ, with_query_string=False,
-            path_info='/_rules/rule.xml')
-
         if should_theme_uri:
+            if self.rewrite_links:
+                app = relocateresponse.RelocateMiddleware(
+                    app, old_href=remote_uri)
+
+            rule_uri = construct_url(
+                environ, with_query_string=False,
+                path_info='/_rules/rule.xml')
+
             app = DeliveranceMiddleware(
                 app,
                 theme_uri=domain_info.theme_uri,