L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Poltawski
2016-04-20 11:52:16 +01:00
parent af61aeda9b 54df1bdcf7
commit 9b2faf2056
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repository/merlot/lib.php
+1 -1
View File
@@ -85,7 +85,7 @@ class repository_merlot extends repository {
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);