From a04df99154225819d1db55e52afcb3a8956c4193 Mon Sep 17 00:00:00 2001 From: phalkunz Date: Fri, 9 Apr 2010 04:56:39 +0000 Subject: [PATCH] MINOR: remove unnecessary expression git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@102275 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- .htaccess | 2 ++ mysite/_config.php | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 177f473..cd3900b 100644 --- a/.htaccess +++ b/.htaccess @@ -12,6 +12,8 @@ RewriteEngine On + RewriteBase /ss2.4 + RewriteCond %{REQUEST_URI} ^(.*)$ RewriteCond %{REQUEST_FILENAME} !-f RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L] diff --git a/mysite/_config.php b/mysite/_config.php index c68538b..99ed559 100644 --- a/mysite/_config.php +++ b/mysite/_config.php @@ -4,7 +4,7 @@ global $project; $project = 'mysite'; global $database; -$database = ''; +$database = 'SS_ss24'; require_once('conf/ConfigureFromEnv.php'); @@ -14,5 +14,13 @@ MySQLDatabase::set_connection_charset('utf8'); // downloaded from http://www.silverstripe.org/themes/ SSViewer::set_theme('blackcandy'); +// Set the site locale +i18n::set_locale('en_US'); + // enable nested URLs for this site (e.g. page/sub-page/) SiteTree::enable_nested_urls(); + +// Mollom config +Mollom::setPublicKey("1819023dfcb10a667d10bd1578c5f39b"); +Mollom::setPrivateKey("2430fcbd65756ac6732a54a7c9ada116"); +SpamProtectorManager::set_spam_protector('MollomSpamProtector'); \ No newline at end of file