Permalink
Browse files

Reverted junk-commits from "Removed .mergesources.yml, not used since…

… the dark SVN days"

This partially reverts commit 744605d.
  • Loading branch information...
1 parent f976ed9 commit 7898f89fb321c49fb76e557916cf6d6bac22fc12 @sminnee sminnee committed Nov 8, 2012
Showing with 24 additions and 31 deletions.
  1. +6 −2 .htaccess
  2. +18 −21 mysite/_config.php
  3. +0 −8 mysite/code/Page.php
View
@@ -20,10 +20,14 @@ ErrorDocument 500 /assets/error-500.html
<IfModule mod_rewrite.c>
SetEnv HTTP_MOD_REWRITE On
RewriteEngine On
- RewriteBase '/ss-3.0'
RewriteCond %{REQUEST_URI} ^(.*)$
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>
### SILVERSTRIPE END ###
View
@@ -1,21 +1,18 @@
-<?php
-
-global $project;
-$project = 'mysite';
-
-global $database;
-$database = 'SS_ss30';
-
-require_once('conf/ConfigureFromEnv.php');
-
-MySQLDatabase::set_connection_charset('utf8');
-
-// Set the current theme. More themes can be downloaded from
-// http://www.silverstripe.org/themes/
-SSViewer::set_theme('simple');
-
-// Set the site locale
-i18n::set_locale('en_US');
-
-// Enable nested URLs for this site (e.g. page/sub-page/)
-if (class_exists('SiteTree')) SiteTree::enable_nested_urls();
+<?php
+
+global $project;
+$project = 'mysite';
+
+global $database;
+$database = '';
+
+require_once('conf/ConfigureFromEnv.php');
+
+MySQLDatabase::set_connection_charset('utf8');
+
+// Set the current theme. More themes can be downloaded from
+// http://www.silverstripe.org/themes/
+SSViewer::set_theme('simple');
+
+// Enable nested URLs for this site (e.g. page/sub-page/)
+if(class_exists('SiteTree')) SiteTree::enable_nested_urls();
View
@@ -7,14 +7,6 @@ class Page extends SiteTree {
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 {

0 comments on commit 7898f89

Please sign in to comment.