Removed .mergesources.yml, not used since the dark SVN days

This commit is contained in:
Ingo Schommer 2012-11-08 14:03:39 +01:00
parent 2debb0ddfd
commit 744605d21a
4 changed files with 31 additions and 35 deletions

View File

@ -20,14 +20,10 @@ 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 [QSA] RewriteRule .* framework/main.php?url=%1&%{QUERY_STRING} [L]
RewriteCond %{REQUEST_URI} ^(.*)/framework/main.php$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule . %1/install.php? [R,L]
</IfModule> </IfModule>
### SILVERSTRIPE END ### ### SILVERSTRIPE END ###

View File

@ -1,11 +0,0 @@
# Data source for the "arb" svn merge tool (see http://github.com/sminnee/arborist).
# Keeps track of all opensource branches of submodules
# that could be merged back to the current submodule paths.
2.3:
.: /open/phpinstaller/branches/2.3
sapphire: /open/modules/sapphire/branches/2.3
cms: /open/modules/cms/branches/2.3
2.4:
.: /open/phpinstaller/branches/2.4
sapphire: /open/modules/sapphire/branches/2.4
cms: /open/modules/cms/branches/2.4

View File

@ -4,7 +4,7 @@ global $project;
$project = 'mysite'; $project = 'mysite';
global $database; global $database;
$database = ''; $database = 'SS_ss30';
require_once('conf/ConfigureFromEnv.php'); require_once('conf/ConfigureFromEnv.php');
@ -14,5 +14,8 @@ MySQLDatabase::set_connection_charset('utf8');
// http://www.silverstripe.org/themes/ // http://www.silverstripe.org/themes/
SSViewer::set_theme('simple'); SSViewer::set_theme('simple');
// Set the site locale
i18n::set_locale('en_US');
// Enable nested URLs for this site (e.g. page/sub-page/) // Enable nested URLs for this site (e.g. page/sub-page/)
if (class_exists('SiteTree')) SiteTree::enable_nested_urls(); if (class_exists('SiteTree')) SiteTree::enable_nested_urls();

View File

@ -7,6 +7,14 @@ 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 {