From faf8cdd574f2c9762a1ad976fa9711db6c24967e Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Thu, 26 Mar 2015 20:46:07 -0500 Subject: [PATCH 1/2] Minor - Add comment about slowliness of query --- main/inc/lib/usermanager.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 82ab00eebc..7bc4cde8f6 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -2751,7 +2751,8 @@ class UserManager if ($session_visibility == SESSION_INVISIBLE) { continue; } - + // This query is horribly slow when more than a few thousand + // users and just a few sessions to which they are subscribed $id_session = $enreg['id']; $personal_course_list_sql = "SELECT DISTINCT course.code code, From f2f238d888a09288686aa7b35452f225f9b519a0 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Fri, 27 Mar 2015 02:55:02 -0500 Subject: [PATCH 2/2] Allow admin to enter groups page even if social tool is disabled --- main/social/groups.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/social/groups.php b/main/social/groups.php index 2fb3f94251..0b3c7363cb 100755 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -10,7 +10,7 @@ $cidReset = true; require_once '../inc/global.inc.php'; api_block_anonymous_users(); -if (api_get_setting('allow_social_tool') != 'true') { +if (api_get_setting('allow_social_tool') != 'true' && !api_is_platform_admin()) { api_not_allowed(); }