Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into julio6666

main/admin/add_many_session_to_category.php

@@ -144,7 +144,13 @@ if (empty($rows_session_category)) {
     exit;
 }
 
-$sql = "SELECT id, name  FROM $tbl_session $where ORDER BY name";
+if (api_get_multiple_access_url()) {
+    $table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+    $access_url_id = api_get_current_access_url_id();
+    $sql = "SELECT s.id, s.name  FROM $tbl_session s INNER JOIN $table_access_url_rel_session u ON s.id = u.session_id $where AND u.access_url_id = $access_url_id ORDER BY name";
+} else {
+    $sql = "SELECT id, name  FROM $tbl_session $where ORDER BY name";
+} 
 $result=Database::query($sql);
 $rows_session = Database::store_result($result);
 ?>

main/inc/lib/groupmanager.lib.php

@@ -489,9 +489,7 @@ class GroupManager
         //$forum_id = get_forums_of_group($group_id);
         $group_id = Database::escape_string($group_id);
         $category = self::get_category_from_group($group_id);
-        if ($maximum_number_of_students > $category['max_student'] && $category['max_student'] != 0) {
-            $maximum_number_of_students = $category['max_student'];
-        }
+
         $course_id = api_get_course_int_id();
 
         $sql = "UPDATE ".$table_group."