From ca27086c844c7e0f502e5e8e29e74fd0ac9fd5f6 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 8 Mar 2010 20:26:34 +0000
Subject: [PATCH] BUGFIX Fixed SiteTree->MetaTags() to either use <meta name=>
 or <meta http-equiv=>, and only using the "http-equiv" attribute for valid
 HTTP headers (see http://www.w3.org/TR/html4/struct/global.html#edef-META)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@100631 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/model/SiteTree.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php
index eae320d7e..2a0abe6fc 100755
--- a/core/model/SiteTree.php
+++ b/core/model/SiteTree.php
@@ -1145,17 +1145,15 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 		}
 		$version = new SapphireInfo();
 
-		$tags .= "<meta name=\"generator\" http-equiv=\"generator\" content=\"SilverStripe - http://www.silverstripe.com\" />\n";
+		$tags .= "<meta name=\"generator\" content=\"SilverStripe - http://www.silverstripe.com\" />\n";
 
 		$charset = ContentNegotiator::get_encoding();
 		$tags .= "<meta http-equiv=\"Content-type\" content=\"text/html; charset=$charset\" />\n";
 		if($this->MetaKeywords) {
-			$tags .= "<meta name=\"keywords\" http-equiv=\"keywords\" content=\"" .
-				Convert::raw2att($this->MetaKeywords) . "\" />\n";
+			$tags .= "<meta name=\"keywords\" content=\"" . Convert::raw2att($this->MetaKeywords) . "\" />\n";
 		}
 		if($this->MetaDescription) {
-			$tags .= "<meta name=\"description\" http-equiv=\"description\" content=\"" .
-				Convert::raw2att($this->MetaDescription) . "\" />\n";
+			$tags .= "<meta name=\"description\" content=\"" . Convert::raw2att($this->MetaDescription) . "\" />\n";
 		}
 		if($this->ExtraMeta) { 
 			$tags .= $this->ExtraMeta . "\n";