Merge branch 'wip-MDL-33985-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 05:00:33 +0000 (13:00 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 05:00:33 +0000 (13:00 +0800)
lib/filestorage/zip_packer.php
repository/equella/lib.php

index 2cae435..a7726a6 100644 (file)
@@ -299,7 +299,7 @@ class zip_packer extends file_packer {
         global $CFG;
 
         if (!is_string($archivefile)) {
-            return $archivefile->extract_to_pathname($this, $contextid, $component, $filearea, $itemid, $pathbase, $userid);
+            return $archivefile->extract_to_storage($this, $contextid, $component, $filearea, $itemid, $pathbase, $userid);
         }
 
         check_dir_exists($CFG->tempdir.'/zip');
index 3665ef1..36a524b 100644 (file)
@@ -85,7 +85,7 @@ class repository_equella extends repository {
                 . '&returnprefix=tle'
                 . '&template=standard'
                 . '&token='.urlencode($this->getssotoken('write'))
-                . '&courseId='.urlencode($COURSE->id)
+                . '&courseId='.urlencode($COURSE->idnumber)
                 . '&courseCode='.urlencode($COURSE->shortname)
                 . '&action=searchThin'
                 . '&forcePost=true'