diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 18:13:48 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 18:13:48 -0600 |
| commit | 2bf98dcead733a6a2daf9fa0a5d3084ed4ebef5c (patch) | |
| tree | 463e042456b461fb47fd3184d88bd6fb67d9f741 | |
| parent | cb4bd3f8812b469afb489bdc60473a234837e50c (diff) | |
| parent | e7d9cfa009ba8e22b0e75f1401ea2caa70c89c5b (diff) | |
| download | forums-2bf98dcead733a6a2daf9fa0a5d3084ed4ebef5c.tar forums-2bf98dcead733a6a2daf9fa0a5d3084ed4ebef5c.tar.gz forums-2bf98dcead733a6a2daf9fa0a5d3084ed4ebef5c.tar.bz2 forums-2bf98dcead733a6a2daf9fa0a5d3084ed4ebef5c.tar.xz forums-2bf98dcead733a6a2daf9fa0a5d3084ed4ebef5c.zip | |
Merge remote-tracking branch 'remotes/marc/ticket/11398' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/11398:
[ticket/11398] Correctly call permission_set method in permission tool
| -rw-r--r-- | phpBB/includes/db/migration/tool/permission.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php index 3b196fdbc2..2f09c0ac72 100644 --- a/phpBB/includes/db/migration/tool/permission.php +++ b/phpBB/includes/db/migration/tool/permission.php @@ -422,7 +422,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte $this->db->sql_query($sql); $role_name = $this->db->sql_fetchfield('role_name'); - return $this->set($role_name, $auth_option, 'role', $has_permission); + return $this->permission_set($role_name, $auth_option, 'role', $has_permission); } $sql = 'SELECT auth_option_id, auth_setting |