From 03c5a42f5a24ae053a909fd523b13b97db9fa13b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 11 Feb 2020 20:22:55 -0800
Subject: [PATCH] Fixes for flysystem paths :(

---
 config/filesystems.php                    | 2 +-
 resources/views/layouts/default.blade.php | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/filesystems.php b/config/filesystems.php
index 889c4b246d..6562c48860 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -51,7 +51,7 @@ $config = [
         // This applies the LOCAL public only, not S3/FTP/etc
         'public' => [
             'driver' => 'local',
-            'root' => storage_path('app/public'),
+            'root' => public_path('uploads'),
             'url' => env('APP_URL').'/uploads',
             'visibility' => 'public',
         ],
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 1ec273cca5..d2005e5027 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -12,8 +12,11 @@
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
 
       <meta name="apple-mobile-web-app-capable" content="yes">
-      <link rel="apple-touch-icon" href="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
-      <link rel="apple-touch-startup-image" href="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+
+
+
+      <link rel="apple-touch-icon" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url('').e($snipeSettings->logo) : '/img/logo.png' }}">
+      <link rel="apple-touch-startup-image" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url('').e($snipeSettings->logo) : '/img/logo.png' }}">
       <link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url('').e($snipeSettings->favicon) : 'favicon.ico' }} ">