diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-14 23:41:34 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-14 23:41:34 +0100 |
| commit | 388bb6a5e1e8465b11f33f1820f023db271ba9d9 (patch) | |
| tree | 6fee16bd0151b051cfabd97db9d285e6b8b69c29 /lib/app.php | |
| parent | e475c26f1ae3adec2716b4ba59f92382db2bc24e (diff) | |
| parent | 71ae41716a56305ab9509571c0a84311b9f3eb63 (diff) | |
| download | nextcloud-server-388bb6a5e1e8465b11f33f1820f023db271ba9d9.tar.gz nextcloud-server-388bb6a5e1e8465b11f33f1820f023db271ba9d9.zip | |
Merge branch 'master' into fixing-unused-and-undefined-in-master
Diffstat (limited to 'lib/app.php')
| -rw-r--r-- | lib/app.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/app.php b/lib/app.php index e60bce2a201..3b039733fe5 100644 --- a/lib/app.php +++ b/lib/app.php @@ -313,14 +313,14 @@ class OC_App{ $settings[]=array( "id" => "settings", "order" => 1000, "href" => OC_Helper::linkToRoute( "settings_settings" ), "name" => $l->t("Settings"), "icon" => OC_Helper::imagePath( "settings", "settings.svg" )); //SubAdmins are also allowed to access user management - if(OC_SubAdmin::isSubAdmin($_SESSION["user_id"]) || OC_Group::inGroup( $_SESSION["user_id"], "admin" )) { + if(OC_SubAdmin::isSubAdmin(OC_User::getUser())) { // admin users menu $settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkToRoute( "settings_users" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" )); } // if the user is an admin - if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) { + if(OC_User::isAdminUser(OC_User::getUser())) { // admin apps menu $settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkToRoute( "settings_apps" ).'?installed', "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" )); |