[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com...

[odoo/odoo.git] / addons / portal / mail_message.py

diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py
index 4429df3..36b0648 100644 (file)
--- a/addons/portal/mail_message.py
+++ b/addons/portal/mail_message.py
@@ -35,14 +35,14 @@ class mail_message(osv.Model):
         """
         if uid == SUPERUSER_ID:
             return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
-                context=context, count=False, access_rights_uid=access_rights_uid)
+                context=context, count=count, access_rights_uid=access_rights_uid)
         group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
         group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
         if group_user_id not in [group.id for group in group_ids]:
             args = [('subtype_id', '!=', False)] + list(args)
 
         return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
-            context=context, count=False, access_rights_uid=access_rights_uid)
+            context=context, count=count, access_rights_uid=access_rights_uid)
 
     def check_access_rule(self, cr, uid, ids, operation, context=None):
         """ Add Access rules of mail.message for non-employee user: