diff options
| author | David King <imkingdavid@gmail.com> | 2012-12-12 20:19:06 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-12-12 20:19:06 -0500 |
| commit | a5783211c90e226a9d1a2b3636f63f1a80aced19 (patch) | |
| tree | 475ea31673d3081af179a741a629de6e3d679fd4 /phpBB/install/database_update.php | |
| parent | 5fc6752178ebc814c83b88b5891c568273d36c94 (diff) | |
| download | forums-a5783211c90e226a9d1a2b3636f63f1a80aced19.tar forums-a5783211c90e226a9d1a2b3636f63f1a80aced19.tar.gz forums-a5783211c90e226a9d1a2b3636f63f1a80aced19.tar.bz2 forums-a5783211c90e226a9d1a2b3636f63f1a80aced19.tar.xz forums-a5783211c90e226a9d1a2b3636f63f1a80aced19.zip | |
[ticket/11088] Pass required objects in as arguments
PHPBB3-11088
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index fb762c6137..7aa346b817 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -822,14 +822,14 @@ function _add_modules($modules_to_install) * Add a new permission, optionally copy permission setting from another * * @param auth_admin $auth_admin auth_admin object +* @param dbal $db Database object * @param string $permission_name Name of the permission to add * @param bool $is_global True is global, false is local * @param string $copy_from Optional permission name from which to copy * @return bool true on success, false on failure */ -function _add_permission($permission_name, $is_global = true, $copy_from = '') +function _add_permission(auth_admin $auth_admin, dbal $db, $permission_name, $is_global = true, $copy_from = '') { - global $db, $auth_admin; // Only add a permission that don't already exist if (!empty($auth_admin->acl_options['id'][$permission_name])) { @@ -2921,8 +2921,8 @@ function change_database_data(&$no_updates, $version) include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx); $auth_admin = new auth_admin(); - _add_permission('u_chgprofileinfo', true, 'u_sig'); - _add_permission('a_extensions', true, 'a_styles'); + _add_permission($auth_admin, $db, 'u_chgprofileinfo', true, 'u_sig'); + _add_permission($auth_admin, $db, 'a_extensions', true, 'a_styles'); // Update the auth setting for the module $sql = 'UPDATE ' . MODULES_TABLE . " |