From 805ceb700585a869c23627f60ac46e0a151aec33 Mon Sep 17 00:00:00 2001
From: wrossiter <wrossiter@467b73ca-7a2a-4603-9d3b-597d59a354a9>
Date: Sun, 24 Oct 2010 06:47:18 +0000
Subject: [PATCH] MINOR: reverted previous commit. Note to self dont work on
 sunday nights, sigh

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113086 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .mergesources.yml    |  6 +-----
 mysite/_config.php   | 27 +--------------------------
 mysite/code/Page.php |  6 +-----
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/.mergesources.yml b/.mergesources.yml
index b89b29c..bc71aae 100644
--- a/.mergesources.yml
+++ b/.mergesources.yml
@@ -5,8 +5,4 @@ trunk:
   .: /open/phpinstaller/trunk
   sapphire: /open/modules/sapphire/trunk
   cms: /open/modules/cms/trunk
-
-sscom:
- sapphire: /modules/sapphire/branches/2.4-sscom
- cms: /modules/cms/branches/2.4-sscom
-
+  jsparty: /open/modules/jsparty/trunk
\ No newline at end of file
diff --git a/mysite/_config.php b/mysite/_config.php
index 25d7f1e..c68538b 100644
--- a/mysite/_config.php
+++ b/mysite/_config.php
@@ -5,31 +5,8 @@ $project = 'mysite';
 
 global $database;
 $database = '';
-//require_once('conf/ConfigureFromEnv.php');
-
-Director::set_environment_type("dev");
-global $databaseConfig;
-
-/*
-$databaseConfig = array(
-	'type' => 'PostgreSQLDatabase',
-	'server' => 'localhost',
-	'username' => 'postgres',
-	'password' => 'postgres',
-	'database' => 'SS_24modules'
-);
-
-*/
-
-$databaseConfig = array(
-	"type" => 'SQLiteDatabase',
-	"server" => '', 
-	"username" => '', 
-	"password" => '', 
-	"database" => '24modules',
-	"path" => ASSETS_PATH .'/.db',
-);
 
+require_once('conf/ConfigureFromEnv.php');
 
 MySQLDatabase::set_connection_charset('utf8');
 
@@ -39,5 +16,3 @@ SSViewer::set_theme('blackcandy');
 
 // enable nested URLs for this site (e.g. page/sub-page/)
 SiteTree::enable_nested_urls();
-
-Security::setDefaultAdmin('username', 'password');
\ No newline at end of file
diff --git a/mysite/code/Page.php b/mysite/code/Page.php
index 1631d35..310620f 100755
--- a/mysite/code/Page.php
+++ b/mysite/code/Page.php
@@ -2,7 +2,6 @@
 class Page extends SiteTree {
 
 	public static $db = array(
-		'Test' => 'Boolean'
 	);
 
 	public static $has_one = array(
@@ -31,15 +30,12 @@ class Page_Controller extends ContentController {
 
 	public function init() {
 		parent::init();
-		Validator::set_javascript_validation_handler('none');
+
 		// Note: you should use SS template require tags inside your templates 
 		// instead of putting Requirements calls here.  However these are 
 		// included so that our older themes still work
-		Requirements::javascript('sapphire/thirdparty/jquery/jquery.js');
-	
 		Requirements::themedCSS('layout'); 
 		Requirements::themedCSS('typography'); 
 		Requirements::themedCSS('form'); 
-
 	}
 }
\ No newline at end of file