summaryrefslogtreecommitdiffstats
path: root/lib/app.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-01-15 14:57:23 +0100
committerRobin Appelman <icewind@owncloud.com>2013-01-15 14:57:23 +0100
commit9bf367e7f803d6968dc2c639624ce191d538a5bc (patch)
tree5ef8bec79c46d548d198ca87bbbc9b16974bb5a5 /lib/app.php
parent3a9ec452729bf9b6a51d36750b095d9ef80a5f7e (diff)
parentbb9cc227c2583adc6b51a1f6d75a9fc8333836b9 (diff)
downloadnextcloud-server-9bf367e7f803d6968dc2c639624ce191d538a5bc.tar.gz
nextcloud-server-9bf367e7f803d6968dc2c639624ce191d538a5bc.zip
merge master into filesystem
Diffstat (limited to 'lib/app.php')
-rw-r--r--lib/app.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/app.php b/lib/app.php
index 2926b794857..05d1c818c70 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" ));