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

Remove cms.tempDir - use temp_path()

This commit is contained in:
Samuel Georges 2015-02-07 15:42:20 +11:00
parent fbf46519b4
commit 8e1b4c2f68
6 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UPGRADE.md
View File

@ -29,6 +29,10 @@ Optional things you can delete, if they do not contain anything custom.
[DELETE] /app [DELETE] /app
[DELETE] /storage/cache [DELETE] /storage/cache
### Remmoved config
cms.tempDir - use temp_path()
### Breaking code changes ### Breaking code changes
#### Paginator / setCurrentPage #### Paginator / setCurrentPage

11
config/cms.php
View File

@ -185,17 +185,6 @@ return array(
'uploadsDir' => '/uploads', 'uploadsDir' => '/uploads',
/*
|--------------------------------------------------------------------------
| Temporary directory
|--------------------------------------------------------------------------
|
| Specifies a directory used by the application for temporarily storing files.
|
*/
'tempDir' => storage_path().'/temp',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Default permission mask | Default permission mask

2
modules/backend/formwidgets/relation/partials/_relation.htm
View File

@ -1,3 +1,3 @@
<div class="relation-widget" id="<?= $this->getId() ?>"> <div class="relation-widget" id="<?= $this->getId() ?>">
<?= $this->makePartial(PATH_BASE . '/modules/backend/widgets/form/partials/_field_'.$field->type.'.htm', ['field' => $field]) ?> <?= $this->makePartial('~/modules/backend/widgets/form/partials/_field_'.$field->type.'.htm', ['field' => $field]) ?>
</div> </div>

2
modules/backend/models/BrandSettings.php
View File

@ -99,7 +99,7 @@ class BrandSettings extends Model
]); ]);
$parser->parse( $parser->parse(
File::get(PATH_BASE.'/modules/backend/models/brandsettings/custom.less') File::get(base_path().'/modules/backend/models/brandsettings/custom.less')
. self::get('custom_css') . self::get('custom_css')
); );

2
modules/backend/skins/Standard.php
View File

@ -21,7 +21,7 @@ class Standard extends Skin
*/ */
public function __construct() public function __construct()
{ {
$this->skinPath = $this->defaultSkinPath = PATH_BASE . '/modules/backend'; $this->skinPath = $this->defaultSkinPath = base_path() . '/modules/backend';
$this->publicSkinPath = $this->defaultPublicSkinPath = File::localToPublic($this->skinPath); $this->publicSkinPath = $this->defaultPublicSkinPath = File::localToPublic($this->skinPath);
} }

4
modules/system/classes/UpdateManager.php
View File

@ -77,8 +77,8 @@ class UpdateManager
$this->versionManager = VersionManager::instance(); $this->versionManager = VersionManager::instance();
$this->migrator = App::make('migrator'); $this->migrator = App::make('migrator');
$this->repository = App::make('migration.repository'); $this->repository = App::make('migration.repository');
$this->tempDirectory = Config::get('cms.tempDir', sys_get_temp_dir()); $this->tempDirectory = temp_path();
$this->baseDirectory = PATH_BASE; $this->baseDirectory = base_path();
$this->disableCoreUpdates = Config::get('cms.disableCoreUpdates', false); $this->disableCoreUpdates = Config::get('cms.disableCoreUpdates', false);
/* /*