From fbf937102e8eea5255a67cbff22f837964bd7c7f Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 20 Jul 2017 10:39:58 +0100 Subject: [PATCH 1/2] Try and get media uploading working again --- app/Http/Controllers/MicropubClientController.php | 6 +++--- changelog.md | 3 +++ resources/views/templates/new-note-form.blade.php | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/MicropubClientController.php b/app/Http/Controllers/MicropubClientController.php index 79b51875..5ceaa781 100644 --- a/app/Http/Controllers/MicropubClientController.php +++ b/app/Http/Controllers/MicropubClientController.php @@ -55,8 +55,8 @@ class MicropubClientController extends Controller */ public function processMedia(Request $request) { - if ($request->hasFile('file') == false) { - return back()->with('error', 'No file uploaded'); + if ($request->hasFile('files') == false) { + return back()->with('error', 'No files uploaded'); } $user = IndieWebUser::where('me', $request->session()->get('me'))->firstOrFail(); @@ -65,7 +65,7 @@ class MicropubClientController extends Controller } $mediaURLs = []; - foreach ($request->file('file') as $file) { + foreach ($request->file('files') as $file) { try { $response = $this->guzzleClient->request('POST', $user->mediaEndpoint, [ 'headers' => [ diff --git a/changelog.md b/changelog.md index aa1859f4..da5b2d17 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ # Changelog +## Version {next} + - Remove some file checking to see if we can get uploads working again + ## Version 0.5.25 (2017-07-20) - Update npm dev dependencies to use local installs over global installs - Improve contact info display in note mentions by using hovercards diff --git a/resources/views/templates/new-note-form.blade.php b/resources/views/templates/new-note-form.blade.php index d21ac3a4..90bc7e6d 100644 --- a/resources/views/templates/new-note-form.blade.php +++ b/resources/views/templates/new-note-form.blade.php @@ -90,9 +90,8 @@
From 7a2d95b5527072a63e66ac84dea11a5c7fc237ce Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 20 Jul 2017 10:40:49 +0100 Subject: [PATCH 2/2] Bump version to 0.5.26 --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index da5b2d17..7d162cac 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## Version {next} +## Version 0.5.26 (2017-07-20) - Remove some file checking to see if we can get uploads working again ## Version 0.5.25 (2017-07-20)