diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:44:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:44:10 +0200 |
| commit | 28224bad70fe5c2d912d96f2f35e4e5d99301c71 (patch) | |
| tree | f022b99cff7c80074c4f2e82d40e273b56f0a973 /phpBB/phpbb/db | |
| parent | f8046cc2533f9f87eb914564c4e0e1215b0f007f (diff) | |
| parent | 2f44a865a01d1c9d1198484c7a9e841c22ef267d (diff) | |
| download | forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.gz forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.bz2 forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.xz forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12557] Fix load active module description
[ticket/12557] Fix php file description
[ticket/12557] Fix post data description for notifications
[ticket/12557] Fix pass by reference doc blocks
[ticket/12557] Fix doc block in extension base class
[ticket/12557] Fix doc block in mimetype guesser
[ticket/12557] Fix var $preserve_cr description
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Template fixes
[ticket/12557] Search, cron and profilefields fixes
[ticket/12557] Notification fixes
[ticket/12557] Fix doc block errors found by Sami pt1
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/migration/tool/permission.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php index d2df27613a..5cfbc5ca00 100644 --- a/phpBB/phpbb/db/migration/tool/permission.php +++ b/phpBB/phpbb/db/migration/tool/permission.php @@ -105,6 +105,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface * @param string $auth_option The name of the permission (auth) option * @param bool $global True for checking a global permission setting, * False for a local permission setting + * @param int|false $copy_from If set, contains the id of the permission from which to copy the new one. * @return null */ public function add($auth_option, $global = true, $copy_from = false) @@ -243,7 +244,9 @@ class permission implements \phpbb\db\migration\tool\tool_interface * Add a new permission role * * @param string $role_name The new role name - * @param sting $role_type The type (u_, m_, a_) + * @param string $role_type The type (u_, m_, a_) + * @param string $role_description Description of the new role + * * @return null */ public function role_add($role_name, $role_type, $role_description = '') |