Browse Source

Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x

Nicolas Ducoulombier 7 years ago
parent
commit
94c4acdbed
2 changed files with 3 additions and 1 deletions
  1. 2 1
      main/calendar/agenda_list.php
  2. 1 0
      main/group/group_space.php

+ 2 - 1
main/calendar/agenda_list.php

@@ -17,6 +17,7 @@ $currentGroupdId = api_get_group_id();
 
 if (!empty($currentGroupdId)) {
     $groupProperties = GroupManager::get_group_properties($currentGroupdId);
+    $currentGroupdId = $groupProperties['iid'];
     $interbreadcrumb[] = array(
         "url" => api_get_path(WEB_CODE_PATH)."group/group.php?".api_get_cidreq(),
         "name" => get_lang('Groups')
@@ -33,7 +34,7 @@ $events = $agenda->getEvents(
     null,
     null,
     $currentCourseId,
-    api_get_group_id(),
+    $currentGroupdId,
     null,
     'array'
 );

+ 1 - 0
main/group/group_space.php

@@ -23,6 +23,7 @@ require_once api_get_path(SYS_CODE_PATH).'forum/forumconfig.inc.php';
 $group_id = api_get_group_id();
 $user_id = api_get_user_id();
 $current_group = GroupManager::get_group_properties($group_id);
+$group_id = $current_group['iid'];
 if (empty($current_group)) {
     api_not_allowed(true);
 }