From 4c7c3dfd474cb3bad2e55b38162068c49849c8bc Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 8 Apr 2015 22:05:32 -0700
Subject: [PATCH] Fixes #751 - Meta-tag issues.

---
 e107_core/templates/header_default.php | 29 ++++++++++++++------------
 e107_handlers/application.php          |  9 ++++++--
 e107_plugins/social/e_header.php       |  1 -
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php
index 7dbba3535..c304f3780 100644
--- a/e107_core/templates/header_default.php
+++ b/e107_core/templates/header_default.php
@@ -142,8 +142,22 @@ if(vartrue($pref['meta_author'][e_LANGUAGE])) e107::meta('author',$pref['meta_au
 if($pref['sitebutton']) e107::meta('og:image',$tp->replaceConstants($pref['sitelogo'],'full'));
 if(defined("VIEWPORT")) e107::meta('viewport',VIEWPORT); //BC ONLY 
 
-echo e107::getUrl()->response()->renderMeta()."\n";
 
+// Load Plugin Header Files, allow them to load CSS/JSS/Meta via JS Manager early enouhg
+// NOTE: e_header.php should not output content, it should only register stuff!
+// e_meta.php is more appropriate for outputting header content.
+$e_headers = e107::pref('core','e_header_list');
+if ($e_headers && is_array($e_headers))
+{
+	foreach($e_headers as $val)
+	{
+		// no checks fore existing file - performance
+		e107_include(e_PLUGIN.$val."/e_header.php");
+	}
+}
+unset($e_headers);
+
+echo e107::getUrl()->response()->renderMeta()."\n"; // render all the e107::meta() entries.
 
 echo "<title>".(defined('e_PAGETITLE') ? e_PAGETITLE.' - ' : (defined('PAGE_NAME') ? PAGE_NAME.' - ' : "")).SITENAME."</title>\n\n";
 
@@ -169,18 +183,7 @@ if (/*!defined("PREVIEWTHEME") && */! (isset($no_core_css) && $no_core_css !==tr
 	$e_js->otherCSS('{e_WEB_CSS}e107.css');
 }
 
-// Load Plugin Header Files, allow them to load CSS/JSS via JS Manager early enouhg
-// NOTE: e_header.php should not output content, it should only register stuff! e_meta.php is more appropriate for outputting header content.
-$e_headers = $e_pref->get('e_header_list');
-if ($e_headers && is_array($e_headers))
-{
-	foreach($e_headers as $val)
-	{
-		// no checks fore existing file - performance
-		e107_include(e_PLUGIN.$val."/e_header.php");
-	}
-}
-unset($e_headers);
+
 
 // re-initalize in case globals are destroyed from $e_headers includes
 $e_js = e107::getJs();
diff --git a/e107_handlers/application.php b/e107_handlers/application.php
index e0a344893..6825e1b6d 100644
--- a/e107_handlers/application.php
+++ b/e107_handlers/application.php
@@ -3967,9 +3967,14 @@ class eResponse
 				
 		if(null !== $name)
 		{
-			$key = (substr($name,0,3) == 'og:') ? 'property' : 'name';			
-			$attr[$key] = $name;
+		//	$key = (substr($name,0,3) == 'og:') ? 'property' : 'name';
+		//	$attr[$key] = $name;
+			$attr['property'] = $name;  // giving both should be valid and avoid issues with FB and others.
+			$attr['name'] = $name;
 		}
+
+
+
 		if(null !== $content) $attr['content'] = $content;
 		if(!empty($extended)) 
 		{
diff --git a/e107_plugins/social/e_header.php b/e107_plugins/social/e_header.php
index 27cbcfac8..70e0b8fee 100644
--- a/e107_plugins/social/e_header.php
+++ b/e107_plugins/social/e_header.php
@@ -15,5 +15,4 @@ if(USER_AREA)
 }
 
 
-
 ?>
\ No newline at end of file