diff options
| author | Simon Rettberg | 2017-12-15 21:37:08 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-15 21:37:08 +0100 |
| commit | e41a8074713861bdd8c6ef34d4f3465864bf4cd4 (patch) | |
| tree | 6c62391ce7e1d7944889dc675c0e8ab26cf2dfe6 /modules-available/permissionmanager/inc/permissionutil.inc.php | |
| parent | [roomplanner] Fix deleting PCs after loading room plan (diff) | |
| parent | [backup] added permissions to create and restore backups (diff) | |
| download | slx-admin-e41a8074713861bdd8c6ef34d4f3465864bf4cd4.tar.gz slx-admin-e41a8074713861bdd8c6ef34d4f3465864bf4cd4.tar.xz slx-admin-e41a8074713861bdd8c6ef34d4f3465864bf4cd4.zip | |
Merge branch 'permission-manager' of openslx.org:openslx-ng/slx-admin into permission-manager
Diffstat (limited to 'modules-available/permissionmanager/inc/permissionutil.inc.php')
| -rw-r--r-- | modules-available/permissionmanager/inc/permissionutil.inc.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules-available/permissionmanager/inc/permissionutil.inc.php b/modules-available/permissionmanager/inc/permissionutil.inc.php index 391cd047..64fe8f26 100644 --- a/modules-available/permissionmanager/inc/permissionutil.inc.php +++ b/modules-available/permissionmanager/inc/permissionutil.inc.php @@ -73,10 +73,9 @@ class PermissionUtil if (!is_array($data)) continue; preg_match('#^modules/([^/]+)/#', $file, $out); - $newData = array(); - foreach( $data as $k => $v ) { - $newData[] = $v; - $permissions = self::putInPermissionTree($out[1].".".$k, $v, $permissions); + foreach( $data as $p ) { + $description = Dictionary::translateFileModule($out[1], "permissions", $p); + $permissions = self::putInPermissionTree($out[1].".".$p, $description, $permissions); } } ksort($permissions); |