Merge pull request #73 from oat-sa/release-0.8.0

Release 0.8.0
oat-sa · Mar 3, 2017 · 4a946c4 · 4a946c4
2 parents b2deb34 + 82253c4
commit 4a946c4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/manifest.php b/manifest.php
@@ -27,7 +27,7 @@
     'label' => 'extension-tao-mediamanager',
     'description' => 'TAO media manager extension',
     'license' => 'GPL-2.0',
-    'version' => '0.7.0',
+    'version' => '0.8.0',
     'author' => 'Open Assessment Technologies SA',
     'requires' => array(
         'tao' => '>=7.74.0',

diff --git a/model/ZipImporter.php b/model/ZipImporter.php
@@ -22,6 +22,8 @@
 namespace oat\taoMediaManager\model;
 
 use core_kernel_classes_Class;
+use oat\oatbox\service\ServiceManager;
+use oat\tao\model\upload\UploadService;
 use tao_helpers_form_Form;
 
 /**
@@ -56,9 +58,13 @@ public function import($class, $form)
             $file = $form->getValue('source');
             $resource = new core_kernel_classes_Class($form->getValue('classUri'));
 
+            /** @var  UploadService $uploadService */
+            $uploadService = ServiceManager::getServiceManager()->get(UploadService::SERVICE_ID);
+            $uploadedFile = $uploadService->getUploadedFile($file['uploaded_file']);
+
             // unzip the file
             try {
-                $directory = $this->extractArchive($file['uploaded_file']);
+                $directory = $this->extractArchive($uploadedFile);
             } catch (\Exception $e) {
                 return \common_report_Report::createFailure(__('Unable to extract the archive'));
             }

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -207,6 +207,6 @@ public function update($initialVersion)
             $currentVersion = '0.3.0';
         }
 
-        $this->skip('0.3.0', '0.7.0');
+        $this->skip('0.3.0', '0.8.0');
     }
 }