From 1d6f9318b7f27fab7f0edd1b2814435f1f8f0b33 Mon Sep 17 00:00:00 2001
From: ischommer <ischommer@467b73ca-7a2a-4603-9d3b-597d59a354a9>
Date: Thu, 19 Nov 2009 20:25:04 +0000
Subject: [PATCH] MINOR Mergeinfo

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92260 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .htaccess          | 33 +++++++++++++++++----------------
 .mergesources.yml  |  1 +
 mysite/_config.php | 34 +++++++++++++++++-----------------
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/.htaccess b/.htaccess
index a980233..0152dd5 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,19 +1,20 @@
 ### SILVERSTRIPE START ###
-<IfModule mod_dir.c>
-DirectorySlash Off
-</IfModule>
-
-<Files *.ss>
-Order deny,allow
-Deny from all
-Allow from 127.0.0.1
-</Files>
-
-RewriteEngine On
-
-RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$) 
-
-RewriteCond %{REQUEST_URI} ^(.*)$
-RewriteCond %{REQUEST_FILENAME} !-f
+<IfModule mod_dir.c>
+DirectorySlash Off
+</IfModule>
+
+<Files *.ss>
+Order deny,allow
+Deny from all
+Allow from 127.0.0.1
+</Files>
+
+RewriteEngine On
+RewriteBase /phpinstaller-2.4
+
+RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$) 
+
+RewriteCond %{REQUEST_URI} ^(.*)$
+RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
 ### SILVERSTRIPE END ###
\ No newline at end of file
diff --git a/.mergesources.yml b/.mergesources.yml
index f3b1dff..bc71aae 100644
--- a/.mergesources.yml
+++ b/.mergesources.yml
@@ -2,6 +2,7 @@
 # Keeps track of all opensource branches of submodules 
 # that could be merged back to the current submodule paths.
 trunk:
+  .: /open/phpinstaller/trunk
   sapphire: /open/modules/sapphire/trunk
   cms: /open/modules/cms/trunk
   jsparty: /open/modules/jsparty/trunk
\ No newline at end of file
diff --git a/mysite/_config.php b/mysite/_config.php
index ba9066a..9ac330c 100644
--- a/mysite/_config.php
+++ b/mysite/_config.php
@@ -1,18 +1,18 @@
-<?php
-
-global $project;
-$project = 'mysite';
-
-global $database;
-$database = "";
-
-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/
-SSViewer::set_theme('blackcandy');
-
-// enable nested URLs for this site (e.g. page/sub-page/)
+<?php
+
+global $project;
+$project = 'mysite';
+
+global $database;
+$database = "SS_phpinstaller_24";
+
+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.org/themes/
+SSViewer::set_theme('blackcandy');
+
+// enable nested URLs for this site (e.g. page/sub-page/)
 SiteTree::enable_nested_urls();
\ No newline at end of file