Merge remote-tracking branch 'origin/4.1' into 4

# Conflicts:
#	docs/en/04_Changelogs/4.1.0.md
This commit is contained in:
Damian Mooyman 2018-04-20 12:02:10 +12:00
commit 8f3c0d3b73
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A

View File

@ -28,6 +28,11 @@ When separating the public webroot from the BASE_PATH it is necessary to move a
- Move your existing `.htaccess` from base to `public/` - Move your existing `.htaccess` from base to `public/`
- Update the `RewriteRule` directives in the `.htaccess` (check the [default .htaccess](https://github.com/silverstripe/recipe-core/blob/1.1/public/.htaccess)) - Update the `RewriteRule` directives in the `.htaccess` (check the [default .htaccess](https://github.com/silverstripe/recipe-core/blob/1.1/public/.htaccess))
- Create a new `.htaccess` in base that contains:
```
RewriteEngine On
RewriteRule ^(.*)$ public/$1
```
- Move `index.php` from base to `public/` - Move `index.php` from base to `public/`
- If upgrading from 4.0, replace the [index.php](https://github.com/silverstripe/recipe-core/blob/1.1/public/index.php) file from `recipe-core` in order to fix autoloading paths - If upgrading from 4.0, replace the [index.php](https://github.com/silverstripe/recipe-core/blob/1.1/public/index.php) file from `recipe-core` in order to fix autoloading paths
- Move `assets` folder (including the nested `assets/.protected` folder) into `public/`. - Move `assets` folder (including the nested `assets/.protected` folder) into `public/`.