tonyair
/
silverstripe-installer
mirror of https://github.com/silverstripe/silverstripe-installer
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reverted junk-commits from "Removed .mergesources.yml, not used since the dark SVN days" 

This partially reverts commit 744605d21a.
This commit is contained in:
Sam Minnee 2012-11-09 09:59:14 +13:00
parent f976ed95a5
commit 7898f89fb3
3 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.htaccess
View File

@ -20,10 +20,14 @@ ErrorDocument 500 /assets/error-500.html
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
SetEnv HTTP_MOD_REWRITE On SetEnv HTTP_MOD_REWRITE On
RewriteEngine On RewriteEngine On
RewriteBase '/ss-3.0'
RewriteCond %{REQUEST_URI} ^(.*)$ RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f 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> </IfModule>
### SILVERSTRIPE END ### ### SILVERSTRIPE END ###

39
mysite/_config.php
View File

@ -1,21 +1,18 @@
<?php <?php
global $project; global $project;
$project = 'mysite'; $project = 'mysite';
global $database; global $database;
$database = 'SS_ss30'; $database = '';
require_once('conf/ConfigureFromEnv.php'); require_once('conf/ConfigureFromEnv.php');
MySQLDatabase::set_connection_charset('utf8'); MySQLDatabase::set_connection_charset('utf8');
// Set the current theme. More themes can be downloaded from // Set the current theme. More themes can be downloaded from
// http://www.silverstripe.org/themes/ // http://www.silverstripe.org/themes/
SSViewer::set_theme('simple'); SSViewer::set_theme('simple');
// Set the site locale // Enable nested URLs for this site (e.g. page/sub-page/)
i18n::set_locale('en_US'); if(class_exists('SiteTree')) SiteTree::enable_nested_urls();
// Enable nested URLs for this site (e.g. page/sub-page/)
if (class_exists('SiteTree')) SiteTree::enable_nested_urls();

8
mysite/code/Page.php
View File

@ -7,14 +7,6 @@ class Page extends SiteTree {
public static $has_one = array( 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 { class Page_Controller extends ContentController {