tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Mergeinfo

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92260 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
ischommer 2009-11-19 20:25:04 +00:00 committed by Sam Minnee
parent 371f6c3c1e
commit 1d6f9318b7
3 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.htaccess
View File

@ -1,19 +1,20 @@
### SILVERSTRIPE START ### ### SILVERSTRIPE START ###
<IfModule mod_dir.c> <IfModule mod_dir.c>
DirectorySlash Off DirectorySlash Off
</IfModule> </IfModule>
<Files *.ss> <Files *.ss>
Order deny,allow Order deny,allow
Deny from all Deny from all
Allow from 127.0.0.1 Allow from 127.0.0.1
</Files> </Files>
RewriteEngine On RewriteEngine On
RewriteBase /phpinstaller-2.4
RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)
RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L] RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
### SILVERSTRIPE END ### ### SILVERSTRIPE END ###

1
.mergesources.yml
View File

@ -2,6 +2,7 @@
# Keeps track of all opensource branches of submodules # Keeps track of all opensource branches of submodules
# that could be merged back to the current submodule paths. # that could be merged back to the current submodule paths.
trunk: trunk:
.: /open/phpinstaller/trunk
sapphire: /open/modules/sapphire/trunk sapphire: /open/modules/sapphire/trunk
cms: /open/modules/cms/trunk cms: /open/modules/cms/trunk
jsparty: /open/modules/jsparty/trunk jsparty: /open/modules/jsparty/trunk

34
mysite/_config.php
View File

@ -1,18 +1,18 @@
<?php <?php
global $project; global $project;
$project = 'mysite'; $project = 'mysite';
global $database; global $database;
$database = ""; $database = "SS_phpinstaller_24";
require_once("conf/ConfigureFromEnv.php"); require_once("conf/ConfigureFromEnv.php");
MySQLDatabase::set_connection_charset('utf8'); MySQLDatabase::set_connection_charset('utf8');
// This line set's the current theme. More themes can be // 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'); SSViewer::set_theme('blackcandy');
// enable nested URLs for this site (e.g. page/sub-page/) // enable nested URLs for this site (e.g. page/sub-page/)
SiteTree::enable_nested_urls(); SiteTree::enable_nested_urls();