From 70a409d4b5411bf9e50a70d1cf3855b686304bbe Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 20 Dec 2012 22:33:33 +0100 Subject: [feature/soft-delete] Remove *_restore permissions from the update/install We decided to use only m_approve for now. PHPBB3-9657 --- phpBB/install/database_update.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/install/database_update.php') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6bb5f3c8f0..05b4d27fcc 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2926,14 +2926,14 @@ function change_database_data(&$no_updates, $version) } } - // Add new permissions f_restore, f_softdelete, m_restore and m_softdelete + // Add new permissions f_softdelete and m_softdelete include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx); $auth_admin = new auth_admin(); // Only add the new permission if it does not already exist - if (empty($auth_admin->acl_options['id']['f_restore'])) + if (empty($auth_admin->acl_options['id']['f_softdelete'])) { - $auth_admin->acl_add_option(array('local' => array('f_restore', 'f_softdelete', 'm_restore', 'm_softdelete'))); + $auth_admin->acl_add_option(array('local' => array('f_softdelete', 'm_softdelete'))); // Remove any old permission entries $auth_admin->acl_clear_prefetch(); -- cgit v1.2.1