Author: batiste.bieler
Date: Sat Jun 13 05:34:10 2009
New Revision: 559

Modified:
    trunk/pages/models.py

Log:
Fix issue 115

Modified: trunk/pages/models.py
==============================================================================
--- trunk/pages/models.py       (original)
+++ trunk/pages/models.py       Sat Jun 13 05:34:10 2009
@@ -185,12 +185,12 @@
          get the template of this page if defined or if closer parent if
          defined or DEFAULT_PAGE_TEMPLATE otherwise
          """
+        if self.template:
+            template = self.template
+
          template = cache.get(self.PAGE_TEMPLATE_KEY % (self.id))
          if template:
              return template
-
-        if self.template:
-            template = self.template

          if not template:
              for p in self.get_ancestors(ascending=True):

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to