[Checkins] SVN: Products.Five/branches/1.5/ backported r70998 from trunk:

[Yvo Schubbe]

Log message for revision 71009:
  backported r70998 from trunk:
  - Fixed collector issue 2198.

Changed:
  U   Products.Five/branches/1.5/CHANGES.txt
  U   Products.Five/branches/1.5/site/localsite.py

-=-
Modified: Products.Five/branches/1.5/CHANGES.txt
===================================================================
--- Products.Five/branches/1.5/CHANGES.txt	2006-10-31 14:36:54 UTC (rev 71008)
+++ Products.Five/branches/1.5/CHANGES.txt	2006-10-31 14:40:45 UTC (rev 71009)
@@ -5,6 +5,8 @@
 Five 1.5.1 (unreleased)
 =======================
 
+* site: Fixed small bug in FiveSiteManager. (issue #2198)
+
 * browser: processInputs now decodes strings in lists and tuples.
 
 * formlib: Removed redundant subpageform.pt and pageform.pt. Added missing

Modified: Products.Five/branches/1.5/site/localsite.py
===================================================================
--- Products.Five/branches/1.5/site/localsite.py	2006-10-31 14:36:54 UTC (rev 71008)
+++ Products.Five/branches/1.5/site/localsite.py	2006-10-31 14:40:45 UTC (rev 71009)
@@ -51,7 +51,7 @@
     def __bases__(self):
         next = self.next
         if next is None:
-            return ()
+            return (getGlobalSiteManager(),)
         return (next,)
 
     @property