changeset 4171:5746f1f27d3e

Fixed: wrong variable names in UID generator usage
author Florian Krupicka <florian.krupicka@googlemail.com>
date Tue, 17 Jun 2008 01:36:31 +0200
parents 02fcab41459f
children 2f64eb47d934
files MoinMoin/formatter/__init__.py MoinMoin/web/contexts.py
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/formatter/__init__.py	Tue Jun 17 01:24:28 2008 +0200
+++ b/MoinMoin/formatter/__init__.py	Tue Jun 17 01:36:31 2008 +0200
@@ -411,7 +411,7 @@
         '''
         Take an ID and make it unique in the current namespace.
         '''
-        ns = self.request.include_id
+        ns = self.request.uid_generator.include_id
         if not ns is None:
             ns = self.sanitize_to_id(ns)
         id = self.sanitize_to_id(id)
@@ -425,7 +425,7 @@
         is suitable if the dot ('.') is valid in IDs for your
         formatter.
         '''
-        ns = self.request.include_id
+        ns = self.request.uid_generator.include_id
         if not ns is None:
             ns = self.sanitize_to_id(ns)
             return '%s.%s' % (ns, id)
--- a/MoinMoin/web/contexts.py	Tue Jun 17 01:24:28 2008 +0200
+++ b/MoinMoin/web/contexts.py	Tue Jun 17 01:36:31 2008 +0200
@@ -270,8 +270,8 @@
 
     def uid_generator(self):
         pagename = None
-        if hasattr(self, 'page') and self.page.pagename:
-            pagename = self.page.pagename
+        if hasattr(self, 'page') and self.page.page_name:
+            pagename = self.page.page_name
         return UniqueIDGenerator(pagename=pagename)
     uid_generator = cached_property(uid_generator)