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

main/coursecopy/classes/Course.class.php

@@ -39,7 +39,7 @@ class Course
         foreach ($this->resources as $type => $resources) {
             if (is_array($resources)) {
                 foreach ($resources as $resource) {
-                    Resource::setClassType($resource);
+                    Coursecopy\Resource::setClassType($resource);
                     if ($resource->links_to($resource_to_check) ) {
                         return true;
                     }

main/coursecopy/classes/CourseSelectForm.class.php

@@ -224,7 +224,7 @@ class CourseSelectForm
 						foreach ($resources as $id => $resource) {
                             if ($resource) {
 								// Event obj in 1.9.x in 1.10.x the class is CalendarEvent
-                                Resource::setClassType($resource);
+                                Coursecopy\Resource::setClassType($resource);
                                 echo '<label class="checkbox">';
                                 echo '<input type="checkbox" name="resource['.$type.']['.$id.']"  id="resource['.$type.']['.$id.']" />';
                                 $resource->show();

main/group/group_space.php

@@ -369,7 +369,7 @@ function get_number_of_group_users()
     $table_group_user = Database :: get_course_table(TABLE_GROUP_USER);
 
     // Query
-    $sql = "SELECT count(id) AS number_of_users
+    $sql = "SELECT count(iid) AS number_of_users
             FROM ".$table_group_user."
             WHERE c_id = $course_id AND group_id='".Database::escape_string($current_group['id'])."'";
     $result = Database::query($sql);