From fdd8f163843352d3ad87cf598d04671621602f76 Mon Sep 17 00:00:00 2001 From: Milos Holba Date: Thu, 28 Jan 2021 11:21:23 +0100 Subject: [PATCH] solved error for get exif data --- app/Http/Helpers/helpers.php | 13 ++++++++++--- app/Http/Tools/Editor.php | 2 +- public/mix-manifest.json | 25 +++++-------------------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/app/Http/Helpers/helpers.php b/app/Http/Helpers/helpers.php index affa6e84..4f96a4f3 100644 --- a/app/Http/Helpers/helpers.php +++ b/app/Http/Helpers/helpers.php @@ -560,9 +560,16 @@ function get_image_meta_data($file) { if (get_file_type_from_mimetype($file->getMimeType()) === 'jpeg') { - return mb_convert_encoding( - exif_read_data($file), 'UTF8', 'UTF8' - ); + try { + + // Try to get the exif data + return mb_convert_encoding(Image::make($file->getRealPath())->exif(),'UTF8', 'UTF8'); + + } catch ( \Exception $e) { + + return null; + + } } } diff --git a/app/Http/Tools/Editor.php b/app/Http/Tools/Editor.php index b3d264f0..1784be8b 100644 --- a/app/Http/Tools/Editor.php +++ b/app/Http/Tools/Editor.php @@ -29,7 +29,7 @@ class Editor /** * Store folder icon * - * @param $folder_iconL + * @param $folder_icon * @param $unique_id * @param $shared */ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 2c9901fe..6a733768 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -75,24 +75,9 @@ "/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2", "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=c001bef2d6d5171cb359", "/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c", - "/js/main.b906f4dccf00f7d0df9b.hot-update.js": "/js/main.b906f4dccf00f7d0df9b.hot-update.js", - "/js/main.51e6604147d828f6788c.hot-update.js": "/js/main.51e6604147d828f6788c.hot-update.js", - "/js/main.0cdd7ec9d134e07cbbe5.hot-update.js": "/js/main.0cdd7ec9d134e07cbbe5.hot-update.js", - "/js/main.a1bbd60a06d2e7857892.hot-update.js": "/js/main.a1bbd60a06d2e7857892.hot-update.js", - "/js/main.7d7511e400150e72f650.hot-update.js": "/js/main.7d7511e400150e72f650.hot-update.js", - "/js/main.fd48cad164a60b75fe37.hot-update.js": "/js/main.fd48cad164a60b75fe37.hot-update.js", - "/js/main.296e16fc2d46f99aeae1.hot-update.js": "/js/main.296e16fc2d46f99aeae1.hot-update.js", - "/js/main.55e979567c0a590fd839.hot-update.js": "/js/main.55e979567c0a590fd839.hot-update.js", - "/js/main.8f9251f7ae8357e3db2e.hot-update.js": "/js/main.8f9251f7ae8357e3db2e.hot-update.js", - "/js/main.de57ba3a3902452e1149.hot-update.js": "/js/main.de57ba3a3902452e1149.hot-update.js", - "/js/main.c29932dfec3afef8d8fd.hot-update.js": "/js/main.c29932dfec3afef8d8fd.hot-update.js", - "/js/main.49b9f8ec98d8ee8c9c32.hot-update.js": "/js/main.49b9f8ec98d8ee8c9c32.hot-update.js", - "/js/main.c2adbb59071c1ca6d186.hot-update.js": "/js/main.c2adbb59071c1ca6d186.hot-update.js", - "/js/main.ac8d05cce080431208c8.hot-update.js": "/js/main.ac8d05cce080431208c8.hot-update.js", - "/js/main.f75a1a86202d4cdc281c.hot-update.js": "/js/main.f75a1a86202d4cdc281c.hot-update.js", - "/js/main.af5c709a6815af8a4e19.hot-update.js": "/js/main.af5c709a6815af8a4e19.hot-update.js", - "/js/main.7318bbc00df71e76481e.hot-update.js": "/js/main.7318bbc00df71e76481e.hot-update.js", - "/js/main.d5f1dacf73037666202d.hot-update.js": "/js/main.d5f1dacf73037666202d.hot-update.js", - "/js/main.bea7af7eaca85b6fec19.hot-update.js": "/js/main.bea7af7eaca85b6fec19.hot-update.js", - "/js/main.8f087722cc55622e0a99.hot-update.js": "/js/main.8f087722cc55622e0a99.hot-update.js" + "/chunks/files~chunks/shared-files~chunks/shared-page.ec24628a2bffb62cbdca.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ec24628a2bffb62cbdca.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.cb885a0b4740cad6c063.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.cb885a0b4740cad6c063.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.b939383f37a3884c393c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b939383f37a3884c393c.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.31298fb82ab2e744bbee.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.31298fb82ab2e744bbee.hot-update.js", + "/js/main.1547e152fa576bc91b79.hot-update.js": "/js/main.1547e152fa576bc91b79.hot-update.js" }