From 4465182852b5c4cb2b86f374dc551fbf8d968ba0 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 5 Jul 2019 15:12:39 -0700 Subject: [PATCH] More meta keyword fixes. --- e107_handlers/application.php | 5 ++++- page.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/e107_handlers/application.php b/e107_handlers/application.php index 55afd8ae3..ea5a2ff13 100644 --- a/e107_handlers/application.php +++ b/e107_handlers/application.php @@ -4322,8 +4322,10 @@ class eResponse if(!empty($attr)) $attr = array_merge($attr, $extended); else $attr = $extended; } + + $key = ($name === 'keywords') ? $name : null; // prevent multiple tags. - if(!empty($attr)) $this->_meta[] = $attr; + if(!empty($attr)) $this->_meta[$key] = $attr; return $this; } @@ -4349,6 +4351,7 @@ class eResponse $this->setMeta('keywords', implode(',',$tmp3)); } + e107::getDebug()->log($this->_meta); foreach ($this->_meta as $attr) { diff --git a/page.php b/page.php index 1200317c4..f72be55b6 100644 --- a/page.php +++ b/page.php @@ -695,7 +695,10 @@ class pageClass define('e_PAGETITLE', eHelper::formatMetaTitle($this->page['page_title'])); if($this->page['page_metadscr']) define('META_DESCRIPTION', eHelper::formatMetaDescription($this->page['page_metadscr'])); - if($this->page['page_metakeys']) define('META_KEYWORDS', eHelper::formatMetaKeys($this->page['page_metakeys'])); + if(!empty($this->page['page_metakeys'])) + { + e107::meta('keywords', eHelper::formatMetaKeys($this->page['page_metakeys'])); + } $tp = e107::getParser();