From 22b407168c79d319705f9d8f99a00538f25d77e2 Mon Sep 17 00:00:00 2001 From: Tom Rix Date: Mon, 1 Mar 2010 21:26:13 +0000 Subject: [PATCH] BUGFIX fixed crash scenario in LeftAndMainSubsites MINOR changed wording on Subsite Virtual Pages. (from r88101) --- code/LeftAndMainSubsites.php | 2 +- code/SubsitesVirtualPage.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/LeftAndMainSubsites.php b/code/LeftAndMainSubsites.php index eecf066..ca75c29 100644 --- a/code/LeftAndMainSubsites.php +++ b/code/LeftAndMainSubsites.php @@ -14,7 +14,7 @@ class LeftAndMainSubsites extends Extension { Requirements::javascript('subsites/javascript/LeftAndMain_Subsites.js'); Requirements::javascript('subsites/javascript/VirtualPage_Subsites.js'); - if ($currentPage = $this->owner->currentPage()) { + if ($this->owner->class == 'CMSMain' && $currentPage = $this->owner->currentPage()) { if (Subsite::currentSubsiteID() != $currentPage->SubsiteID) { Subsite::changeSubsite($currentPage->SubsiteID); } diff --git a/code/SubsitesVirtualPage.php b/code/SubsitesVirtualPage.php index 72b1ed4..6d85c52 100644 --- a/code/SubsitesVirtualPage.php +++ b/code/SubsitesVirtualPage.php @@ -63,10 +63,10 @@ class SubsitesVirtualPage extends VirtualPage { $linkToContentLabelField->setAllowHTML(true); } - $fields->addFieldToTab('Root.Content.Metadata', new TextField('CustomMetaTitle', 'Title (overrides virtual)'), 'MetaTitle'); - $fields->addFieldToTab('Root.Content.Metadata', new TextareaField('CustomMetaKeywords', 'Keywords (overrides virtual)'), 'MetaKeywords'); - $fields->addFieldToTab('Root.Content.Metadata', new TextareaField('CustomMetaDescription', 'Description (overrides virtual)'), 'MetaDescription'); - $fields->addFieldToTab('Root.Content.Metadata', new TextField('CustomExtraMeta', 'Custom Meta Tags (overrides virtual)'), 'ExtraMeta'); + $fields->addFieldToTab('Root.Content.Metadata', new TextField('CustomMetaTitle', 'Title (overrides inherited value from the source)'), 'MetaTitle'); + $fields->addFieldToTab('Root.Content.Metadata', new TextareaField('CustomMetaKeywords', 'Keywords (overrides inherited value from the source)'), 'MetaKeywords'); + $fields->addFieldToTab('Root.Content.Metadata', new TextareaField('CustomMetaDescription', 'Description (overrides inherited value from the source)'), 'MetaDescription'); + $fields->addFieldToTab('Root.Content.Metadata', new TextField('CustomExtraMeta', 'Custom Meta Tags (overrides inherited value from the source)'), 'ExtraMeta'); return $fields; }