Merge pull request #1352 from zvolsky/_revert_wiki

revert wiki to earlier (properly working) state
2016-06-07 20:36:52 -05:00
parent df9928d69c 225a286162
commit 15a26c00b1
1 changed files with 2 additions and 4 deletions
@@ -6503,10 +6503,8 @@ class Wiki(object):
            'wiki_editor' not in auth.user_groups.values() and
                self.settings.groups == auth.user_groups.values()):
            group = db.auth_group(role='wiki_editor')
-            if group:
-                gid = group.id
-            else:
-                db.auth_group.insert(role='wiki_editor')
+            gid = group.id if group else db.auth_group.insert(
+                role='wiki_editor')
            auth.add_membership(gid)

        settings.lock_keys = True