Fixed potential name conflicts in ACL's

misago/acl/builder.py

@@ -59,9 +59,8 @@ def acl(request, user):
 
 
 def build_acl(request, roles):
-    acl = ACL(request.monitor['acl_version'])
-    forums = (Forum.objects.filter(special__in=('private_threads', 'reports'))
-              | Forum.objects.get(special='root').get_descendants().order_by('lft'))
+    new_acl = ACL(request.monitor['acl_version'])
+    forums = Forum.objects.get(special='root').get_descendants().order_by('lft')
     perms = []
     forum_roles = {}
 
@@ -74,19 +73,19 @@ def build_acl(request, roles):
     for provider in settings.PERMISSION_PROVIDERS:
         app_module = import_module(provider)
         try:
-            app_module.build(acl, perms)
+            app_module.build(new_acl, perms)
         except AttributeError:
             pass
         try:
-            app_module.build_forums(acl, perms, forums, forum_roles)
+            app_module.build_forums(new_acl, perms, forums, forum_roles)
         except AttributeError:
             pass
 
     for provider in settings.PERMISSION_PROVIDERS:
         app_module = import_module(provider)
         try:
-            app_module.cleanup(acl, perms, forums)
+            app_module.cleanup(new_acl, perms, forums)
         except AttributeError:
             pass
 
-    return acl
+    return new_acl

misago/models/threadmodel.py

@@ -156,17 +156,17 @@ class Thread(models.Model):
             user = watch.user
             if user.pk != request.user.pk:
                 try:
-                    acl = acl(request, user)
-                    acl.forums.allow_forum_view(self.forum)
-                    acl.threads.allow_thread_view(user, self)
-                    acl.threads.allow_post_view(user, self, post)
+                    user_acl = acl(request, user)
+                    user_acl.forums.allow_forum_view(self.forum)
+                    user_acl.threads.allow_thread_view(user, self)
+                    user_acl.threads.allow_post_view(user, self, post)
                     if not user.is_ignoring(request.user):
                         user.email_user(
-                            request,
-                            '%s_reply_notification' % thread_type,
-                            _('New reply in thread "%(thread)s"') % {'thread': self.name},
-                            {'author': request.user, 'post': post, 'thread': self}
-                            )
+                                        request,
+                                        '%s_reply_notification' % thread_type,
+                                        _('New reply in thread "%(thread)s"') % {'thread': self.name},
+                                        {'author': request.user, 'post': post, 'thread': self}
+                                        )
                 except (ACLError403, ACLError404):
                     pass