TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use alias instead of leading slash 

Refs d292eeb85e
This commit is contained in:
Samuel Georges 2017-11-03 07:57:33 +11:00
parent 014bac1232
commit 712dcf9412
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/backend/widgets/MediaManager.php
View File

@ -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);

3
modules/system/models/MailBrandSetting.php
View File

@ -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();

3
modules/system/models/MailLayout.php
View File

@ -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()));
}
}

3
modules/system/models/MailPartial.php
View File

@ -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()));
}
}

3
modules/system/models/MailTemplate.php
View File

@ -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)