Merge pull request #1094 from kressi/develop

removed attributes from get_user

frappe/desk/doctype/feed/feed.py

@@ -26,7 +26,7 @@ def get_permission_query_conditions(user):
 		return ""
 
 	user_permissions = frappe.defaults.get_user_permissions(user)
-	can_read = frappe.get_user(user).get_can_read()
+	can_read = frappe.get_user().get_can_read()
 
 	can_read_doctypes = ['"{}"'.format(doctype) for doctype in
 		list(set(can_read) - set(user_permissions.keys()))]

frappe/utils/user.py

@@ -283,5 +283,5 @@ def get_enabled_system_users():
 	return frappe.db.sql("""select * from tabUser where
 		user_type='System User' and enabled=1 and name not in ('Administrator', 'Guest')""", as_dict=1)
 
-def is_website_user(user):
-	return frappe.get_user(user).doc.user_type == "Website User"
+def is_website_user():
+	return frappe.get_user().doc.user_type == "Website User"