[Checkins] SVN: z3ext.layout/trunk/ Fixed discriminator for z3ext:pagelet directive

[Nikolay Kim]

Log message for revision 95205:
  Fixed discriminator for z3ext:pagelet directive

Changed:
  U   z3ext.layout/trunk/CHANGES.txt
  U   z3ext.layout/trunk/src/z3ext/layout/zcml.py

-=-
Modified: z3ext.layout/trunk/CHANGES.txt
===================================================================
--- z3ext.layout/trunk/CHANGES.txt	2009-01-27 14:17:30 UTC (rev 95204)
+++ z3ext.layout/trunk/CHANGES.txt	2009-01-27 14:18:32 UTC (rev 95205)
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+
+2.0.6 (Unreleased)
+------------------
+
+- Fixed discriminator for z3ext:pagelet directive
+
+
 2.0.5 (2009-01-26)
 ------------------
 

Modified: z3ext.layout/trunk/src/z3ext/layout/zcml.py
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/zcml.py	2009-01-27 14:17:30 UTC (rev 95204)
+++ z3ext.layout/trunk/src/z3ext/layout/zcml.py	2009-01-27 14:18:32 UTC (rev 95205)
@@ -405,12 +405,14 @@
     for_.append(layer)
     if type:
         _context.action(
-            discriminator = ('z3ext.layout:registerPagelets', new_class),
+            discriminator = (
+                'z3ext.layout:registerPagelets', tuple(type), tuple(for_), layer, name),
             callable = registerTypedPagelets,
             args = (for_, new_class, type, name, _context.info))
     else:
         _context.action(
-            discriminator = ('z3ext.layout:registerPagelets', tuple(for_), layer, name),
+            discriminator = (
+                'z3ext.layout:registerPagelets', tuple(for_), layer, name),
             callable = registerPagelets,
             args = (for_, new_class, provides, name, _context.info))