mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix two minor media manager bugs

Browse Source
This commit is contained in:
niclasleonbock 2015-05-03 16:10:30 +02:00
parent 58ace7ee6c
commit 28f265c10a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/cms/classes/MediaLibrary.php
View File

@ -61,8 +61,11 @@ class MediaLibrary
{ {
$this->storageFolder = self::validatePath(Config::get('cms.storage.media.folder', 'media'), true); $this->storageFolder = self::validatePath(Config::get('cms.storage.media.folder', 'media'), true);
$this->storagePath = rtrim(Config::get('cms.storage.media.path', '/storage/app/media'), '/'); $this->storagePath = rtrim(Config::get('cms.storage.media.path', '/storage/app/media'), '/');
if (!preg_match("/(\/\/|http|https)/", $this->storagePath)) { if (!preg_match("/(\/\/|http|https)/", $this->storagePath)) {
$this->storagePath = Request::getBasePath() . $this->storagePath; $this->storagePath = Request::getBasePath() . $this->storagePath;
} else {
$this->storagePath .= '/';
} }
$this->ignoreNames = Config::get('cms.storage.media.ignore', $this->defaultIgnoreNames); $this->ignoreNames = Config::get('cms.storage.media.ignore', $this->defaultIgnoreNames);

2
modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm
View File

@ -9,7 +9,7 @@
</script> </script>
<script type="text/template" data-control="video-template"> <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> <div class="panel media-player-fallback">Your browser doesn't support HTML5 video.</div>
</video> </video>
</script> </script>