tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-06-26 14:39:28 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Reverted accidental commit from r92260

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

1
.htaccess
View File

@ -10,7 +10,6 @@ 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$)

1
.mergesources.yml
View File

@ -2,7 +2,6 @@
# 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

4
mysite/_config.php
View File

@ -4,14 +4,14 @@ global $project;
$project = 'mysite'; $project = 'mysite';
global $database; global $database;
$database = "SS_phpinstaller_24"; $database = "";
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.org/themes/ // downloaded from http://www.silverstripe.com/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/)