From 28f265c10aca7216630364ba8c8c7b951f9bb00c Mon Sep 17 00:00:00 2001
From: niclasleonbock <niclasleonbock@gmail.com>
Date: Sun, 3 May 2015 16:10:30 +0200
Subject: [PATCH] Fix two minor media manager bugs

---
 modules/cms/classes/MediaLibrary.php                         | 5 ++++-
 .../widgets/mediamanager/partials/_item-sidebar-preview.htm  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/cms/classes/MediaLibrary.php b/modules/cms/classes/MediaLibrary.php
index 2a48db46b..6be42df54 100644
--- a/modules/cms/classes/MediaLibrary.php
+++ b/modules/cms/classes/MediaLibrary.php
@@ -61,8 +61,11 @@ class MediaLibrary
     {
         $this->storageFolder = self::validatePath(Config::get('cms.storage.media.folder', 'media'), true);
         $this->storagePath = rtrim(Config::get('cms.storage.media.path', '/storage/app/media'), '/');
+
         if (!preg_match("/(\/\/|http|https)/", $this->storagePath)) {
             $this->storagePath = Request::getBasePath() . $this->storagePath;
+        } else {
+            $this->storagePath .= '/';
         }
 
         $this->ignoreNames = Config::get('cms.storage.media.ignore', $this->defaultIgnoreNames);
@@ -604,4 +607,4 @@ class MediaLibrary
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm b/modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm
index 4f8860958..38007f55e 100644
--- a/modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm
+++ b/modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm
@@ -9,7 +9,7 @@
 </script>
 
 <script type="text/template" data-control="video-template">
-    <video src="{src}" controls poster="<?= URL::to('modules/cms/Widgets/mediamanager/assets/images/video-poster.png') ?>">
+    <video src="{src}" controls poster="<?= URL::to('modules/cms/widgets/mediamanager/assets/images/video-poster.png') ?>">
         <div class="panel media-player-fallback">Your browser doesn't support HTML5 video.</div>
     </video>
 </script>
@@ -34,4 +34,4 @@
             <p><?= e(trans('cms::lang.media.multiple_selected')) ?></p>
         </div>
     </div>
-</script>
\ No newline at end of file
+</script>