From 7898f89fb321c49fb76e557916cf6d6bac22fc12 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Fri, 9 Nov 2012 09:59:14 +1300
Subject: [PATCH] Reverted junk-commits from "Removed .mergesources.yml, not
 used since the dark SVN days"

This partially reverts commit 744605d21a8e58966611a4c774b489657f8097ac.
---
 .htaccess            |  8 ++++++--
 mysite/_config.php   | 39 ++++++++++++++++++---------------------
 mysite/code/Page.php |  8 --------
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/.htaccess b/.htaccess
index be44e11..aa65e8f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -20,10 +20,14 @@ ErrorDocument 500 /assets/error-500.html
 <IfModule mod_rewrite.c>
 	SetEnv HTTP_MOD_REWRITE On
 	RewriteEngine On
-	RewriteBase '/ss-3.0'
 
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteRule .* framework/main.php?url=%1&%{QUERY_STRING} [L]
+	RewriteRule .* framework/main.php?url=%1 [QSA]
+
+	RewriteCond %{REQUEST_URI} ^(.*)/framework/main.php$
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteRule . %1/install.php? [R,L]
+
 </IfModule>
 ### SILVERSTRIPE END ###
diff --git a/mysite/_config.php b/mysite/_config.php
index 784034d..92f5022 100644
--- a/mysite/_config.php
+++ b/mysite/_config.php
@@ -1,21 +1,18 @@
-<?php
-
-global $project;
-$project = 'mysite';
-
-global $database;
-$database = 'SS_ss30';
-
-require_once('conf/ConfigureFromEnv.php');
-
-MySQLDatabase::set_connection_charset('utf8');
-
-// Set the current theme. More themes can be downloaded from
-// http://www.silverstripe.org/themes/
-SSViewer::set_theme('simple');
-
-// Set the site locale
-i18n::set_locale('en_US');
-
-// Enable nested URLs for this site (e.g. page/sub-page/)
-if (class_exists('SiteTree')) SiteTree::enable_nested_urls();
\ No newline at end of file
+<?php
+
+global $project;
+$project = 'mysite';
+
+global $database;
+$database = '';
+
+require_once('conf/ConfigureFromEnv.php');
+
+MySQLDatabase::set_connection_charset('utf8');
+
+// Set the current theme. More themes can be downloaded from
+// http://www.silverstripe.org/themes/
+SSViewer::set_theme('simple');
+
+// Enable nested URLs for this site (e.g. page/sub-page/)
+if(class_exists('SiteTree')) SiteTree::enable_nested_urls();
\ No newline at end of file
diff --git a/mysite/code/Page.php b/mysite/code/Page.php
index 05886f5..6ed23a2 100755
--- a/mysite/code/Page.php
+++ b/mysite/code/Page.php
@@ -7,14 +7,6 @@ class Page extends SiteTree {
 	public static $has_one = array(
 	);
 
-	function getCMSFields() {
-		$fields = parent::getCMSFields();
-		$fields->findOrMakeTab('Root.Bla.Foo1');
-		$fields->findOrMakeTab('Root.Bla.Foo2');
-
-		return $fields;
-	}
-
 }
 class Page_Controller extends ContentController {