From 38e7df2e917e8b97b2ec576f6d67c43d2c6e780e Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 8 Oct 2012 17:01:53 +0200 Subject: [PATCH] NEW Enable SiteTree::$nested_urls by default --- docs/en/changelogs/3.1.0.md | 3 ++- tests/travis/_config.php | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/en/changelogs/3.1.0.md b/docs/en/changelogs/3.1.0.md index 86a409ab250..20f531d1f26 100644 --- a/docs/en/changelogs/3.1.0.md +++ b/docs/en/changelogs/3.1.0.md @@ -8,4 +8,5 @@ * Deprecated `Profiler` class, use third-party solutions like [xhprof](https://github.com/facebook/xhprof/) * Removed defunct or unnecessary debug GET parameters: `debug_profile`, `debug_memory`, `profile_trace`, `debug_javascript`, `debug_behaviour` - * Removed `Member_ProfileForm`, use `CMSProfileController` instead \ No newline at end of file + * Removed `Member_ProfileForm`, use `CMSProfileController` instead + * `SiteTree::$nested_urls` enabled by default. To disable, call `SiteTree::disable_nested_urls()`. \ No newline at end of file diff --git a/tests/travis/_config.php b/tests/travis/_config.php index 3508957db96..87a69ab9ae8 100644 --- a/tests/travis/_config.php +++ b/tests/travis/_config.php @@ -16,7 +16,4 @@ // 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(); \ No newline at end of file +SSViewer::set_theme('simple'); \ No newline at end of file