merge master into filesystem

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/user.php b/lib/user.php
index 80f88ca7052..8d4eb7aec4d 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -300,6 +300,19 @@ class OC_User {
 	}
 
 	/**
+	 * @brief Check if the user is an admin user
+	 * @param $uid uid of the admin
+	 * @returns bool
+	 */
+	public static function isAdminUser($uid) {
+		if(OC_Group::inGroup($uid, 'admin' )) {
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
 	 * @brief get the user id of the user currently logged in.
 	 * @return string uid or false
 	 */