aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-12-20 22:33:33 +0100
committerJoas Schilling <nickvergessen@gmx.de>2012-12-20 22:39:38 +0100
commit70a409d4b5411bf9e50a70d1cf3855b686304bbe (patch)
treea74915c92313422e0cb38325be528bd49375fb76 /phpBB/install/database_update.php
parent1a07cd63a1e5a7edd7ee21365f2c7e340a8bac3d (diff)
downloadforums-70a409d4b5411bf9e50a70d1cf3855b686304bbe.tar
forums-70a409d4b5411bf9e50a70d1cf3855b686304bbe.tar.gz
forums-70a409d4b5411bf9e50a70d1cf3855b686304bbe.tar.bz2
forums-70a409d4b5411bf9e50a70d1cf3855b686304bbe.tar.xz
forums-70a409d4b5411bf9e50a70d1cf3855b686304bbe.zip
[feature/soft-delete] Remove *_restore permissions from the update/install
We decided to use only m_approve for now. PHPBB3-9657
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php6
1 files changed, 3 insertions, 3 deletions
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();