Merge branch 'master' )of ssh://people.ipfire.org/pub/git/ipfire.org

diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index 6c2539de2ccdf1e096b7d33e92dcdc7f5dc2a50b..7d1d0cbafbb17f60d5208c02ab6cdf244ee0fbf6 100644 (file)
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -178,7 +178,7 @@ class Wiki(misc.Object):
 
                        # If user is in a matching group, we grant permission
                        for group in row.groups:
-                               if group in account.groups:
+                               if account.is_member_of_group(group):
                                        return True
 
                        # Otherwise access is not permitted