From 0b82e1f44f6bfc7af6c7336fa404e5b79c0745b3 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 16 Apr 2015 19:13:33 +1000
Subject: [PATCH] Fixes operation in subfolders

---
 modules/cms/classes/MediaLibrary.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/cms/classes/MediaLibrary.php b/modules/cms/classes/MediaLibrary.php
index c75a4aef1..243fbc335 100644
--- a/modules/cms/classes/MediaLibrary.php
+++ b/modules/cms/classes/MediaLibrary.php
@@ -1,5 +1,6 @@
 <?php namespace Cms\Classes;
 
+use Request;
 use ApplicationException;
 use SystemException;
 use Config;
@@ -58,9 +59,12 @@ class MediaLibrary
      */
     protected function init()
     {
+        $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->storageFolder = self::validatePath(
-            Config::get('cms.storage.media.folder', 'media'), true);
+        if (!preg_match("/(\/\/|http|https)/", $this->storagePath)) {
+            $this->storagePath = Request::getBasePath() . $this->storagePath;
+        }
+
         $this->ignoreNames = Config::get('cms.storage.media.ignore', $this->defaultIgnoreNames);
 
         $this->storageFolderNameLength = strlen($this->storageFolder);