tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-06-26 14:39:28 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: reverted previous commit. Note to self dont work on sunday nights, sigh

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113086 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
wrossiter 2010-10-24 06:47:18 +00:00 committed by Sam Minnee
parent 218cfffe21
commit 805ceb7005
3 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.mergesources.yml
View File

@ -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

27
mysite/_config.php
View File

@ -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');

6
mysite/code/Page.php
View File

@ -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');
}
}