diff --git a/code/model/RedirectorPage.php b/code/model/RedirectorPage.php
index 6378bee0..2c55fbc2 100644
--- a/code/model/RedirectorPage.php
+++ b/code/model/RedirectorPage.php
@@ -121,8 +121,6 @@ class RedirectorPage extends Page {
// Remove all metadata fields, does not apply for redirector pages
$fields->removeByName('MetaTagsHeader');
- $fields->removeByName('MetaTitle');
- $fields->removeByName('MetaKeywords');
$fields->removeByName('MetaDescription');
$fields->removeByName('ExtraMeta');
diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php
index 38608d7c..261fdcfc 100644
--- a/code/model/SiteTree.php
+++ b/code/model/SiteTree.php
@@ -76,9 +76,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
"Title" => "Varchar(255)",
"MenuTitle" => "Varchar(100)",
"Content" => "HTMLText",
- "MetaTitle" => "Varchar(255)",
"MetaDescription" => "Text",
- "MetaKeywords" => "Varchar(255)",
"ExtraMeta" => "HTMLText",
"ShowInMenus" => "Boolean",
"ShowInSearch" => "Boolean",
@@ -1268,18 +1266,13 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
public function MetaTags($includeTitle = true) {
$tags = "";
if($includeTitle === true || $includeTitle == 'true') {
- $tags .= "
" . Convert::raw2xml(($this->MetaTitle)
- ? $this->MetaTitle
- : $this->Title) . "\n";
+ $tags .= "" . $this->Title . "\n";
}
$tags .= "\n";
$charset = ContentNegotiator::get_encoding();
$tags .= "\n";
- if($this->MetaKeywords) {
- $tags .= "MetaKeywords) . "\" />\n";
- }
if($this->MetaDescription) {
$tags .= "MetaDescription) . "\" />\n";
}
@@ -1852,11 +1845,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$htmlField = new HtmlEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", 'HTML editor title')),
ToggleCompositeField::create('Metadata', _t('SiteTree.MetadataToggle', 'Metadata'),
array(
- $metaIntroField = new CompositeField(
- $metaIntro = new LabelField("MetaIntro", $Title = "Metadata helps describe and categorise your site. By filling out the fields below it will help improve your site's ranking on search engines.")
- ),
- $metaFieldTitle = new TextField("MetaTitle", $this->fieldLabel('MetaTitle')),
- $metaFieldKeyword = new TextareaField("MetaKeywords", $this->fieldLabel('MetaKeywords'), 1),
$metaFieldDesc = new TextareaField("MetaDescription", $this->fieldLabel('MetaDescription')),
$metaFieldExtra = new TextareaField("ExtraMeta",$this->fieldLabel('ExtraMeta'))
)
@@ -1870,17 +1858,23 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
);
$htmlField->addExtraClass('stacked');
- $metaIntroField->addExtraClass('field');
- $metaIntro->addExtraClass('help');
// Help text for MetaData on page content editor
- $metaFieldTitle->setRightTitle(_t('SiteTree.METATITLEHELP', "Add the title of your page here"))
- ->addExtraClass('help');
- $metaFieldKeyword->setRightTitle(_t('SiteTree.METAKEYWORDHELP', "Add any keywords that are relevant to the page here. Separate keywords and phrases with a comma: keyword, keywords, keyword phrase"))
- ->addExtraClass('help');
- $metaFieldDesc->setRightTitle(_t('SiteTree.METADESCHELP', "Add a description of your page here. Make sure you think about your keywords when writing your description"))
- ->addExtraClass('help');
- $metaFieldExtra->setRightTitle(_t('SiteTree.METAEXTRAHELP', "When adding custom meta tags they must be wrapped in an html tag. For example <meta name=\"customName\" content=\"your custom content here\" />"))
- ->addExtraClass('help');
+ $metaFieldDesc
+ ->setRightTitle(
+ _t(
+ 'SiteTree.METADESCHELP',
+ "Search engines use this content for displaying search results (although it will not influence their ranking)."
+ )
+ )
+ ->addExtraClass('help');
+ $metaFieldExtra
+ ->setRightTitle(
+ _t(
+ 'SiteTree.METAEXTRAHELP',
+ "HTML tags for additional meta information. For example <meta name=\"customName\" content=\"your custom content here\" />"
+ )
+ )
+ ->addExtraClass('help');
// Conditional dependent pages tab
if($dependentPagesCount) $tabDependent->setTitle(_t('SiteTree.TABDEPENDENT', "Dependent pages") . " ($dependentPagesCount)");
@@ -2036,10 +2030,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$labels = parent::fieldLabels($includerelations);
$labels['Title'] = _t('SiteTree.PAGETITLE', "Page name");
$labels['MenuTitle'] = _t('SiteTree.MENUTITLE', "Navigation label");
- $labels['MetaIntro'] = _t('SiteTree.METAINTRO', "Metadata helps describe and categorise your site. By filling out the fields below it will help improve your site's ranking on search engines.");
- $labels['MetaTitle'] = _t('SiteTree.METATITLE', "Meta Title");
$labels['MetaDescription'] = _t('SiteTree.METADESC', "Meta Description");
- $labels['MetaKeywords'] = _t('SiteTree.METAKEYWORDS', "Meta Keywords");
$labels['ExtraMeta'] = _t('SiteTree.METAEXTRA', "Custom Meta Tags");
$labels['ClassName'] = _t('SiteTree.PAGETYPE', "Page type", 'Classname of a page object');
$labels['ParentType'] = _t('SiteTree.PARENTTYPE', "Page location");
diff --git a/tests/controller/CMSSiteTreeFilterTest.php b/tests/controller/CMSSiteTreeFilterTest.php
index 110349e0..2e3c79bc 100644
--- a/tests/controller/CMSSiteTreeFilterTest.php
+++ b/tests/controller/CMSSiteTreeFilterTest.php
@@ -51,9 +51,9 @@ class CMSSiteTreeFilterTest extends SapphireTest {
$unchangedPage->doPublish();
$changedPage = $this->objFromFixture('Page', 'page2');
- $changedPage->MetaTitle = 'Original';
+ $changedPage->Title = 'Original';
$changedPage->publish('Stage', 'Live');
- $changedPage->MetaTitle = 'Changed';
+ $changedPage->Title = 'Changed';
$changedPage->write();
$f = new CMSSiteTreeFilter_ChangedPages();
diff --git a/tests/model/SiteTreeTest.php b/tests/model/SiteTreeTest.php
index 5f007040..70855809 100644
--- a/tests/model/SiteTreeTest.php
+++ b/tests/model/SiteTreeTest.php
@@ -136,17 +136,17 @@ class SiteTreeTest extends SapphireTest {
$this->logInWithPermission('ADMIN');
$obj = $this->objFromFixture('Page', 'about');
- $obj->MetaTitle = "asdfasdf";
+ $obj->Title = "asdfasdf";
$obj->write();
$this->assertTrue($obj->doPublish());
- $this->assertEquals('asdfasdf', DB::query("SELECT \"MetaTitle\" FROM \"SiteTree_Live\" WHERE \"ID\" = '$obj->ID'")->value());
+ $this->assertEquals('asdfasdf', DB::query("SELECT \"Title\" FROM \"SiteTree_Live\" WHERE \"ID\" = '$obj->ID'")->value());
- $obj->MetaTitle = null;
+ $obj->Title = null;
$obj->write();
$this->assertTrue($obj->doPublish());
- $this->assertNull(DB::query("SELECT \"MetaTitle\" FROM \"SiteTree_Live\" WHERE \"ID\" = '$obj->ID'")->value());
+ $this->assertNull(DB::query("SELECT \"Title\" FROM \"SiteTree_Live\" WHERE \"ID\" = '$obj->ID'")->value());
}