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:
sminnee 2008-11-13 21:01:24 +00:00
parent a0a0d69782
commit e8d26a0dc8
1 changed files with 13 additions and 1 deletions

View File

@ -687,12 +687,12 @@ PHP
$_SERVER['SCRIPT_FILENAME'] = dirname(realpath($_SERVER['SCRIPT_FILENAME'])) . '/sapphire/main.php';
chdir('sapphire');
$_GET['flush'] = true;
require_once('core/Core.php');
$this->statusMessage("Building database schema...");
// Build database
$_GET['flush'] = true;
$con = new Controller();
$con->pushCurrent();
@ -803,6 +803,12 @@ PHP
DirectorySlash Off
</IfModule>
<Files *.ss>
Order deny,allow
Deny from all
Allow from 127.0.0.1
</Files>
RewriteEngine On
$baseClause
RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$
@ -841,6 +847,12 @@ TEXT
DirectorySlash Off
</IfModule>
<Files *.ss>
Order deny,allow
Deny from all
Allow from 127.0.0.1
</Files>
RewriteEngine On
$baseClause
RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$