Merge branch 'MDL-65019-master' of git://github.com/jleyva/moodle

diff --cc course/externallib.php
index a4d322c,83a789b..fb3481a
--- 1/course/externallib.php
--- 2/course/externallib.php
+++ b/course/externallib.php
@@@ -326,6 -326,10 +326,11 @@@ class core_course_external extends exte
                                      'mimetypes' => array(),
                                  );
                                  foreach ($contents as $content) {
 -                                        $module['contentsinfo']['repositorytype'] = isset($content['repositorytype']) ? $content['repositorytype'] : '';
+                                     // Check repository file (only main file).
+                                     if (!isset($module['contentsinfo']['repositorytype'])) {
++                                          $module['contentsinfo']['repositorytype'] =
++                                                  isset($content['repositorytype']) ? $content['repositorytype'] : '';
+                                     }
                                      if (isset($content['filesize'])) {
                                          $module['contentsinfo']['filessize'] += $content['filesize'];
                                      }

diff --cc course/tests/externallib_test.php
Simple merge