From 537f637e47dda5332b507516b288d050f80a3cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1sztor=20G=C3=A1bor?= <gpasztor87@gmail.com>
Date: Fri, 15 Jan 2016 10:07:39 +0100
Subject: [PATCH] Storage path

---
 modules/backend/controllers/index/_warnings.htm | 16 ++++++++--------
 modules/system/classes/CombineAssets.php        |  4 ++--
 modules/system/classes/PluginManager.php        |  2 +-
 modules/system/console/OctoberUtil.php          |  2 +-
 modules/system/models/File.php                  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/backend/controllers/index/_warnings.htm b/modules/backend/controllers/index/_warnings.htm
index e43cc1778..db076a269 100644
--- a/modules/backend/controllers/index/_warnings.htm
+++ b/modules/backend/controllers/index/_warnings.htm
@@ -4,14 +4,14 @@ $warnings = [];
 $writablePaths = [
     temp_path(),
     themes_path(),
-    base_path().'/storage',
-    base_path().'/storage/app',
-    base_path().'/storage/logs',
-    base_path().'/storage/framework',
-    base_path().'/storage/cms',
-    base_path().'/storage/cms/cache',
-    base_path().'/storage/cms/twig',
-    base_path().'/storage/cms/combiner',
+    storage_path(),
+    storage_path('app'),
+    storage_path('logs'),
+    storage_path('framework'),
+    storage_path('cms'),
+    storage_path('cms/cache'),
+    storage_path('cms/twig'),
+    storage_path('cms/combiner'),
 ];
 $requiredExtensions = [
     'GD' => extension_loaded('gd'),
diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index dd0081627..40481fd77 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -171,7 +171,7 @@ class CombineAssets
         }
 
         $this->localPath = $cacheInfo['path'];
-        $this->storagePath = storage_path().'/cms/combiner/assets';
+        $this->storagePath = storage_path('cms/combiner/assets');
 
         $combiner = $this->prepareCombiner($cacheInfo['files']);
         $contents = $combiner->dump();
@@ -278,7 +278,7 @@ class CombineAssets
         }
 
         $this->localPath = $localPath;
-        $this->storagePath = storage_path().'/cms/combiner/assets';
+        $this->storagePath = storage_path('cms/combiner/assets');
 
         list($assets, $extension) = $this->prepareAssets($assets);
 
diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
index d538b0ace..bb270c059 100644
--- a/modules/system/classes/PluginManager.php
+++ b/modules/system/classes/PluginManager.php
@@ -66,7 +66,7 @@ class PluginManager
     protected function init()
     {
         $this->bindContainerObjects();
-        $this->metaFile = storage_path() . '/cms/disabled.json';
+        $this->metaFile = storage_path('cms/disabled.json');
         $this->loadDisabled();
         $this->loadPlugins();
         $this->loadDependencies();
diff --git a/modules/system/console/OctoberUtil.php b/modules/system/console/OctoberUtil.php
index e7775e882..464fcd4d7 100644
--- a/modules/system/console/OctoberUtil.php
+++ b/modules/system/console/OctoberUtil.php
@@ -178,7 +178,7 @@ class OctoberUtil extends Command
         }
 
         $totalCount = 0;
-        $uploadsPath = Config::get('filesystems.disks.local.root', storage_path().'/app');
+        $uploadsPath = Config::get('filesystems.disks.local.root', storage_path('app'));
         $uploadsPath .= '/uploads';
 
         /*
diff --git a/modules/system/models/File.php b/modules/system/models/File.php
index cef3a8cee..aeb9e34c5 100644
--- a/modules/system/models/File.php
+++ b/modules/system/models/File.php
@@ -22,7 +22,7 @@ class File extends FileBase
      */
     protected function getLocalRootPath()
     {
-        return Config::get('filesystems.disks.local.root', storage_path().'/app');
+        return Config::get('filesystems.disks.local.root', storage_path('app'));
     }
 
     /**