mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-10-22 15:05:33 +00:00
Merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65840 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
a0a0d69782
commit
e8d26a0dc8
14
install.php
14
install.php
@ -687,12 +687,12 @@ PHP
|
|||||||
$_SERVER['SCRIPT_FILENAME'] = dirname(realpath($_SERVER['SCRIPT_FILENAME'])) . '/sapphire/main.php';
|
$_SERVER['SCRIPT_FILENAME'] = dirname(realpath($_SERVER['SCRIPT_FILENAME'])) . '/sapphire/main.php';
|
||||||
chdir('sapphire');
|
chdir('sapphire');
|
||||||
|
|
||||||
|
$_GET['flush'] = true;
|
||||||
require_once('core/Core.php');
|
require_once('core/Core.php');
|
||||||
|
|
||||||
$this->statusMessage("Building database schema...");
|
$this->statusMessage("Building database schema...");
|
||||||
|
|
||||||
// Build database
|
// Build database
|
||||||
$_GET['flush'] = true;
|
|
||||||
$con = new Controller();
|
$con = new Controller();
|
||||||
$con->pushCurrent();
|
$con->pushCurrent();
|
||||||
|
|
||||||
@ -803,6 +803,12 @@ PHP
|
|||||||
DirectorySlash Off
|
DirectorySlash Off
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
|
<Files *.ss>
|
||||||
|
Order deny,allow
|
||||||
|
Deny from all
|
||||||
|
Allow from 127.0.0.1
|
||||||
|
</Files>
|
||||||
|
|
||||||
RewriteEngine On
|
RewriteEngine On
|
||||||
$baseClause
|
$baseClause
|
||||||
RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$
|
RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$
|
||||||
@ -841,6 +847,12 @@ TEXT
|
|||||||
DirectorySlash Off
|
DirectorySlash Off
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
|
<Files *.ss>
|
||||||
|
Order deny,allow
|
||||||
|
Deny from all
|
||||||
|
Allow from 127.0.0.1
|
||||||
|
</Files>
|
||||||
|
|
||||||
RewriteEngine On
|
RewriteEngine On
|
||||||
$baseClause
|
$baseClause
|
||||||
RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$
|
RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$
|
||||||
|
Loading…
x
Reference in New Issue
Block a user