embed: incorrect title and filename

Fixes #660
directus · Dec 17, 2018 · 2a7b754 · 2a7b754
1 parent 831d112
commit 2a7b754
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/src/core/Directus/Application/CoreServicesProvider.php b/src/core/Directus/Application/CoreServicesProvider.php
@@ -296,7 +296,7 @@ protected function getEmitter()
                 $type = ArrayUtils::get($dataInfo, 'type', ArrayUtils::get($data, 'type'));
 
                 if (strpos($type, 'embed/') === 0) {
-                    $recordData = $files->saveEmbedData($dataInfo);
+                    $recordData = $files->saveEmbedData(array_merge($dataInfo, ArrayUtils::pick($data, ['filename'])));
                 } else {
                     $recordData = $files->saveData($payload['data'], $payload['filename'], $replace);
                 }

diff --git a/src/core/Directus/Embed/Provider/VimeoProvider.php b/src/core/Directus/Embed/Provider/VimeoProvider.php
@@ -53,7 +53,7 @@ protected function fetchInfo($videoID)
     {
         $info = [];
 
-        $info['title'] = 'Unable to retrieve Vimeo title';
+        $info['title'] = null;
         $info['filesize'] = 0;
         $info['width'] = 560;
         $info['height'] = 540;

diff --git a/src/core/Directus/Embed/Provider/YoutubeProvider.php b/src/core/Directus/Embed/Provider/YoutubeProvider.php
@@ -54,7 +54,7 @@ protected function fetchInfo($videoID)
     {
         $info = [];
 
-        $info['title'] = 'Unable to retrieve YouTube title';
+        $info['title'] = null;
         $info['filesize'] = 0;
         $info['height'] = 340;
         $info['width'] = 560;

diff --git a/src/core/Directus/Filesystem/Files.php b/src/core/Directus/Filesystem/Files.php
@@ -289,11 +289,8 @@ public function saveEmbedData(array $fileInfo)
         }
 
         $fileName = isset($fileInfo['filename']) ? $fileInfo['filename'] : md5(time()) . '.jpg';
-        $imageData = $this->saveData($fileInfo['data'], $fileName);
 
-        return array_merge($imageData, $fileInfo, [
-            'filename' => $fileName
-        ]);
+        return $this->saveData($fileInfo['data'], $fileName);
     }
 
     /**