Remove last g_post_topics and g_post_replies

beaver-dev · beaver-dev · commit c00dc24af012 · 2016-04-17T19:52:18.000+02:00
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
@@ -88,7 +88,7 @@ public function edit($req, $res, $args)
                         $permissions_data['post_replies'] != Input::post('post_replies_old')[$perm_group['g_id']] ||
                         $permissions_data['post_topics'] != Input::post('post_topics_old')[$perm_group['g_id']]) {
                             // If there is no group permissions override for this forum
-                            if ($permissions_data['read_forum'] == '1' && $permissions_data['post_replies'] == $perm_group['g_post_replies'] && $permissions_data['post_topics'] == $perm_group['g_post_topics']) {
+                            if ($permissions_data['read_forum'] == '1' && $permissions_data['post_replies'] == $perm_group['topic.reply'] && $permissions_data['post_topics'] == $perm_group['topic.post']) {
                                 $this->model->delete_permissions($args['id'], $perm_group['g_id']);
                             } else {
                             // Run an UPDATE and see if it affected a row, if not, INSERT
diff --git a/featherbb/Model/Admin/Forums.php b/featherbb/Model/Admin/Forums.php
@@ -134,8 +134,7 @@ public function get_permissions($forum_id)
         $perm_data = array();
         $forum_id = Container::get('hooks')->fire('model.admin.forums.get_permissions_start', $forum_id);
 
-        $select_permissions = array('g.g_id', 'g.g_title', 'g.g_post_replies', 'g.g_post_topics', 'fp.read_forum', 'fp.post_replies', 'fp.post_topics');
-        // $select_permissions = array('g.g_id', 'g.g_title', 'fp.read_forum', 'fp.post_replies', 'fp.post_topics');
+        $select_permissions = array('g.g_id', 'g.g_title', 'fp.read_forum', 'fp.post_replies', 'fp.post_topics');
 
         $permissions = DB::for_table('groups')
                         ->table_alias('g')
diff --git a/featherbb/Model/Admin/Groups.php b/featherbb/Model/Admin/Groups.php
@@ -169,8 +169,6 @@ public function add_edit_group($groups)
             'g_promote_min_posts'   =>  $promote_min_posts,
             'g_promote_next_group'  =>  $promote_next_group,
             'g_moderator'           =>  $moderator,
-            'g_post_replies'        =>  $post_replies,
-            'g_post_topics'         =>  $post_topics,
         );
         $group_preferences = array(
             'post.min_interval'     => (int) $post_flood,
diff --git a/featherbb/Model/Install.php b/featherbb/Model/Install.php
@@ -80,8 +80,6 @@ class Install
             `g_promote_min_posts` int(10) unsigned NOT NULL DEFAULT '0',
             `g_promote_next_group` int(10) unsigned NOT NULL DEFAULT '0',
             `g_moderator` tinyint(1) NOT NULL DEFAULT '0',
-            `g_post_replies` tinyint(1) NOT NULL DEFAULT '1',
-            `g_post_topics` tinyint(1) NOT NULL DEFAULT '1',
             `inherit` text,
             PRIMARY KEY (`g_id`)
         ) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;",
@@ -282,32 +280,24 @@ public static function load_default_groups()
             'g_title' => __('Administrators'),
             'g_user_title' => __('Administrator'),
             'g_moderator' => 1,
-            'g_post_replies' => 1,
-            'g_post_topics' => 1
         );
         $groups['Moderators'] = array(
             'g_id' => 2,
             'g_title' => __('Moderators'),
             'g_user_title' => __('Moderator'),
             'g_moderator' => 1,
-            'g_post_replies' => 1,
-            'g_post_topics' => 1
         );
         $groups['Guests'] = array(
             'g_id' => 3,
             'g_title' => __('Guests'),
             'g_user_title' => __('Guest'),
             'g_moderator' => 0,
-            'g_post_replies' => 0,
-            'g_post_topics' => 0
         );
         $groups['Members'] = array(
             'g_id' => 4,
             'g_title' => __('Members'),
             'g_user_title' => __('Member'),
             'g_moderator' => 0,
-            'g_post_replies' => 1,
-            'g_post_topics' => 1
         );
 
         return $groups;
