From 712dcf9412ab24a279753602862b37cc229b16bd Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Fri, 3 Nov 2017 07:57:33 +1100 Subject: [PATCH] Use alias instead of leading slash Refs d292eeb85ecb57f2aa84ab573ea6467584f268e2 --- modules/backend/widgets/MediaManager.php | 3 ++- modules/system/models/MailBrandSetting.php | 3 ++- modules/system/models/MailLayout.php | 3 ++- modules/system/models/MailPartial.php | 3 ++- modules/system/models/MailTemplate.php | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php index bf10a2025..b3a841905 100644 --- a/modules/backend/widgets/MediaManager.php +++ b/modules/backend/widgets/MediaManager.php @@ -16,6 +16,7 @@ use System\Classes\MediaLibrary; use System\Classes\MediaLibraryItem; use October\Rain\Database\Attach\Resizer; use October\Rain\Filesystem\Definitions as FileDefinitions; +use Form as FormHelper; /** * Media Manager widget. @@ -499,7 +500,7 @@ class MediaManager extends WidgetBase { $path = Input::get('path'); $path = MediaLibrary::validatePath($path); - $cropSessionKey = md5(\Form::getSessionKey()); + $cropSessionKey = md5(FormHelper::getSessionKey()); $selectionParams = $this->getSelectionParams(); $urlAndSize = $this->getCropEditImageUrlAndSize($path, $cropSessionKey); diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php index 070633bb2..9e32fe989 100644 --- a/modules/system/models/MailBrandSetting.php +++ b/modules/system/models/MailBrandSetting.php @@ -9,6 +9,7 @@ use Cache; use Config; use Less_Parser; use Exception; +use File as FileHelper; /** * Mail brand settings @@ -151,7 +152,7 @@ class MailBrandSetting extends Model $parser->ModifyVars(static::makeCssVars()); - $parser->parse(\File::get($basePath . '/custom.less')); + $parser->parse(FileHelper::get($basePath . '/custom.less')); $css = $parser->getCss(); diff --git a/modules/system/models/MailLayout.php b/modules/system/models/MailLayout.php index c9a21dd12..d490571db 100644 --- a/modules/system/models/MailLayout.php +++ b/modules/system/models/MailLayout.php @@ -5,6 +5,7 @@ use Model; use System\Classes\MailManager; use October\Rain\Mail\MailParser; use ApplicationException; +use File as FileHelper; /** * Mail layout @@ -131,6 +132,6 @@ class MailLayout extends Model protected static function getTemplateSections($code) { - return MailParser::parse(\File::get(View::make($code)->getPath())); + return MailParser::parse(FileHelper::get(View::make($code)->getPath())); } } diff --git a/modules/system/models/MailPartial.php b/modules/system/models/MailPartial.php index 7679d1232..00b8b23df 100644 --- a/modules/system/models/MailPartial.php +++ b/modules/system/models/MailPartial.php @@ -8,6 +8,7 @@ use System\Classes\MailManager; use October\Rain\Mail\MailParser; use ApplicationException; use Exception; +use File as FileHelper; /** * Mail partial @@ -115,6 +116,6 @@ class MailPartial extends Model protected static function getTemplateSections($code) { - return MailParser::parse(\File::get(View::make($code)->getPath())); + return MailParser::parse(FileHelper::get(View::make($code)->getPath())); } } diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php index 9f6f0edab..400f85375 100644 --- a/modules/system/models/MailTemplate.php +++ b/modules/system/models/MailTemplate.php @@ -5,6 +5,7 @@ use View; use Model; use System\Classes\MailManager; use October\Rain\Mail\MailParser; +use File as FileHelper; /** * Mail template @@ -146,7 +147,7 @@ class MailTemplate extends Model protected static function getTemplateSections($code) { - return MailParser::parse(\File::get(View::make($code)->getPath())); + return MailParser::parse(FileHelper::get(View::make($code)->getPath())); } public static function findOrMakeTemplate($code)