From 36dbefedcff5500f1a6c6e4833f1c5c37f3c42e0 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 12 Apr 2010 03:39:50 +0000 Subject: [PATCH] BUGFIX Fixed URLSegment access for translated homepages in SiteTree->RelativeLink (#4781, thanks martijn) (from r97211) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102434 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/SiteTree.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index 73175abea..767677116 100755 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -376,8 +376,14 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid $base = $this->URLSegment; } + // Unset base for homepage URLSegments in their default language. + // Homepages with action parameters or in different languages + // need to retain their URLSegment. if(!$action && $base == RootURLController::get_homepage_link()) { $base = null; + if($this->hasExtension('Translatable') && $this->Locale != Translatable::default_locale()){ + $base = $this->URLSegment; + } } if(is_string($action)) {