diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php index 31a4229a0..bf10a2025 100644 --- a/modules/backend/widgets/MediaManager.php +++ b/modules/backend/widgets/MediaManager.php @@ -4,7 +4,6 @@ use Url; use Str; use Lang; use File; -use Form; use Input; use Config; use Request; @@ -500,7 +499,7 @@ class MediaManager extends WidgetBase { $path = Input::get('path'); $path = MediaLibrary::validatePath($path); - $cropSessionKey = md5(Form::getSessionKey()); + $cropSessionKey = md5(\Form::getSessionKey()); $selectionParams = $this->getSelectionParams(); $urlAndSize = $this->getCropEditImageUrlAndSize($path, $cropSessionKey); diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php index 267592150..070633bb2 100644 --- a/modules/system/models/MailBrandSetting.php +++ b/modules/system/models/MailBrandSetting.php @@ -3,7 +3,6 @@ use App; use Url; use Str; -use File; use Lang; use Model; use Cache; @@ -152,7 +151,7 @@ class MailBrandSetting extends Model $parser->ModifyVars(static::makeCssVars()); - $parser->parse(File::get($basePath . '/custom.less')); + $parser->parse(\File::get($basePath . '/custom.less')); $css = $parser->getCss(); diff --git a/modules/system/models/MailLayout.php b/modules/system/models/MailLayout.php index df7065459..c9a21dd12 100644 --- a/modules/system/models/MailLayout.php +++ b/modules/system/models/MailLayout.php @@ -1,6 +1,5 @@ getPath())); + return MailParser::parse(\File::get(View::make($code)->getPath())); } } diff --git a/modules/system/models/MailPartial.php b/modules/system/models/MailPartial.php index d0295e06a..7679d1232 100644 --- a/modules/system/models/MailPartial.php +++ b/modules/system/models/MailPartial.php @@ -1,7 +1,6 @@ getPath())); + return MailParser::parse(\File::get(View::make($code)->getPath())); } } diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php index 9fbd9fbc0..9f6f0edab 100644 --- a/modules/system/models/MailTemplate.php +++ b/modules/system/models/MailTemplate.php @@ -1,7 +1,6 @@ getPath())); + return MailParser::parse(\File::get(View::make($code)->getPath())); } public static function findOrMakeTemplate($code)