mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-10-22 17:05:33 +02:00
MINOR: Updating mergeinfo to ignore mergebacks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92439 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
4b3bc1996d
commit
844acb217d
@ -6,6 +6,7 @@ Allow from 127.0.0.1
|
||||
</Files>
|
||||
|
||||
RewriteEngine On
|
||||
RewriteBase /phpinstaller-trunk
|
||||
|
||||
RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)
|
||||
|
||||
|
@ -4,15 +4,16 @@ global $project;
|
||||
$project = 'mysite';
|
||||
|
||||
global $database;
|
||||
$database = "";
|
||||
$database = "SS_phpinstaller_trunk";
|
||||
|
||||
require_once("conf/ConfigureFromEnv.php");
|
||||
|
||||
MySQLDatabase::set_connection_charset('utf8');
|
||||
|
||||
// This line set's the current theme. More themes can be
|
||||
// downloaded from http://www.silverstripe.com/themes/
|
||||
// downloaded from http://www.silverstripe.org/themes/
|
||||
SSViewer::set_theme('blackcandy');
|
||||
|
||||
// enable nested URLs for this site (e.g. page/sub-page/)
|
||||
SiteTree::enable_nested_urls();
|
||||
?>
|
Loading…
Reference in New Issue
Block a user