Merge branch 'w25_MDL-33733_m20_unzipstorage' of git://github.com/sko…

…dak/moodle into MOODLE_20_STABLE
moodle · Jun 24, 2012 · 2b8387b · 2b8387b
2 parents 1b8d5cf + c2c10bb
commit 2b8387b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/filestorage/zip_packer.php b/lib/filestorage/zip_packer.php
@@ -279,7 +279,7 @@ public function extract_to_storage($archivefile, $contextid, $component, $filear
         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->dataroot.'/temp/zip');