From ba357293b85cfabc78b13d53a65f31efd6cb992c Mon Sep 17 00:00:00 2001
From: sharvey <sharvey@467b73ca-7a2a-4603-9d3b-597d59a354a9>
Date: Mon, 15 Feb 2010 05:21:07 +0000
Subject: [PATCH] MINOR Reverted r98980

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98997 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .htaccess            | 13 ++++++-------
 mysite/_config.php   |  4 +---
 mysite/code/Page.php |  7 -------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.htaccess b/.htaccess
index 597a7f4..5cbd1e8 100644
--- a/.htaccess
+++ b/.htaccess
@@ -10,11 +10,10 @@
 	Deny from all
 </Files>
 
-RewriteEngine On
-RewriteBase /
-
-
-RewriteCond %{REQUEST_URI} ^(.*)$
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule .* sapphire/static-main.php?url=%1&%{QUERY_STRING} [L]
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteCond %{REQUEST_URI} ^(.*)$
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
+</IfModule>
 ### SILVERSTRIPE END ###
diff --git a/mysite/_config.php b/mysite/_config.php
index 5e4b0f0..d117789 100644
--- a/mysite/_config.php
+++ b/mysite/_config.php
@@ -4,7 +4,7 @@ global $project;
 $project = 'mysite';
 
 global $database;
-$database = "SS_mysite_24_test";
+$database = "";
 
 require_once("conf/ConfigureFromEnv.php");
 
@@ -16,5 +16,3 @@ SSViewer::set_theme('blackcandy');
 
 // enable nested URLs for this site (e.g. page/sub-page/)
 SiteTree::enable_nested_urls();
-
-Object::add_extension("SiteTree", "FilesystemPublisher('cache/', 'php')");
\ No newline at end of file
diff --git a/mysite/code/Page.php b/mysite/code/Page.php
index c24c4b8..7d9d708 100755
--- a/mysite/code/Page.php
+++ b/mysite/code/Page.php
@@ -8,13 +8,6 @@ class Page extends SiteTree {
 	public static $has_one = array(
 	);
 	
-	function allPagesToCache() {
-		$pages = DataObject::get('Page');
-		$urls = array();
-		foreach($pages as $page) $urls[] = $page->AbsoluteLink();
-		return $urls;
-	}
-	
 }
 
 class Page_Controller extends ContentController {