Merge branch 'MDL-53095-29' of git://github.com/lameze/moodle into MO…

…ODLE_29_STABLE
moodle · Apr 20, 2016 · 9b2faf2 · 9b2faf2
2 parents af61aed + 54df1bd
commit 9b2faf2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/repository/merlot/lib.php b/repository/merlot/lib.php
@@ -85,7 +85,7 @@ public function get_listing($path = '', $page = '') {
     private function _get_collection($keyword) {
         global $OUTPUT;
         $list = array();
-        $this->api = 'http://www.merlot.org/merlot/materials.rest?keywords=' . urlencode($keyword) . '&licenseKey='.$this->licensekey;
+        $this->api = 'https://www.merlot.org/merlot/materials.rest?keywords=' . urlencode($keyword) . '&licenseKey='.$this->licensekey;
         $c = new curl(array('cache'=>true, 'module_cache'=>'repository'));
         $content = $c->get($this->api);
         $xml = simplexml_load_string($content);