fixed contentValues:

- do not keep the filter inside the filter.
- prevent exception when filter is None.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7194 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/Document/Folder.py

@@ -750,7 +750,8 @@ be a problem)."""
       spec = meta_type
     if portal_type is not None:
       kw['portal_type'] = portal_type
-    kw.update(kw.get('filter', {}))
+    filter = kw.pop('filter', {}) or {}
+    kw.update(filter)
     object_list = CMFBTreeFolder.contentValues(self, spec=spec, filter=kw)
     object_list = sortValueList(object_list, sort_on, sort_order, **kw)
     return object_list