From f42ac5a8e8b0c30297a6fa9ca98a5218d2be20a1 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 28 Sep 2021 13:13:53 -0700
Subject: [PATCH] Replaced e_PAGETITLE with e107::title();

---
 e107_plugins/news/news.php |  1 +
 page.php                   | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
index ff0cdd8a2..311cf62a3 100644
--- a/e107_plugins/news/news.php
+++ b/e107_plugins/news/news.php
@@ -647,6 +647,7 @@ class news_front
 				e107::meta('og:title',$news['news_title']);
 				e107::meta('og:type','article');
 				e107::meta('twitter:card', 'summary');
+				e107::meta('twitter:title',$news['news_title']);
 			}
 
 			if($news['news_meta_description'] && !defined('META_DESCRIPTION'))
diff --git a/page.php b/page.php
index c63dea517..dfdc491c2 100644
--- a/page.php
+++ b/page.php
@@ -381,7 +381,7 @@ class pageClass
 
         if($brow)
         {
-            define('e_PAGETITLE', eHelper::formatMetaTitle($brow['chapter_name']));
+            e107::title(eHelper::formatMetaTitle($brow['chapter_name']));
             if($brow['chapter_meta_description']) define('META_DESCRIPTION', eHelper::formatMetaDescription($brow['chapter_meta_description']));
             if($brow['chapter_meta_keywords']) define('META_KEYWORDS', eHelper::formatMetaKeys($brow['chapter_meta_keywords']));
         }
@@ -480,7 +480,7 @@ class pageClass
 
         if($row)
         {
-            define('e_PAGETITLE', eHelper::formatMetaTitle($row['chapter_name']));
+            e107::title(eHelper::formatMetaTitle($row['chapter_name']));
             if($row['chapter_meta_description']) define('META_DESCRIPTION', eHelper::formatMetaDescription($row['chapter_meta_description']));
             if($row['chapter_meta_keywords']) define('META_KEYWORDS', eHelper::formatMetaKeys($row['chapter_meta_keywords']));
         }
@@ -637,8 +637,8 @@ class pageClass
 			$this->batch = e107::getScBatch('page',null,'cpage')->setVars($this->page)->wrapper('page/'.$this->templateID);
 			$this->batch->breadcrumb();
 			
-			
-			define("e_PAGETITLE", $this->page['page_title']);
+
+			e107::title($this->page['page_title']);
 			
 			return;
 		}
@@ -822,7 +822,8 @@ class pageClass
 			$sc->breadcrumb();
 			$comments = $sc->cpagecomments();
 		} 
-		define('e_PAGETITLE', eHelper::formatMetaTitle($this->cacheData['TITLE']));
+
+		e107::title(eHelper::formatMetaTitle($this->cacheData['TITLE']));
 		define('META_DESCRIPTION', $this->cacheData['META_DSCR']);
 		define('META_KEYWORDS', $this->cacheData['META_KEYS']);
 		if($this->debug)