From 12fec381898ce5c1d5bef7a9b6bf3fcca36addf4 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Mon, 10 Apr 2017 19:53:28 +0200
Subject: [permissionmanager] changed description to tooltips

---
 inc/user.inc.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/user.inc.php b/inc/user.inc.php
index f7688b00..3606f025 100644
--- a/inc/user.inc.php
+++ b/inc/user.inc.php
@@ -26,10 +26,16 @@ class User
 		return self::$user['fullname'];
 	}
 
-	public static function hasPermission($permission)
+	public static function hasPermission($permission, $locationid = NULL)
 	{
 		if (!self::isLoggedIn())
 			return false;
+		if (Module::get("permissionmanager")) {
+			require_once "modules/permissionmanager/inc/permissionutil.inc.php";
+			$module = Request::get("do", false);
+			$permission = $module ? $module.".".$permission : $permission;
+			return PermissionUtil::userHasPermission(self::$user['userid'], $permission, $locationid);
+		}
 		return (self::$user['permissions'] & (Permission::get($permission) | Permission::get('superadmin'))) != 0;
 	}
 
-- 
cgit v1.2.3-55-g7522