mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 04:38:27 +01:00
Code Issues Releases Wiki Activity

Fixes #4775 - News caching issue.

Browse Source
This commit is contained in:
Cameron 2022-05-21 13:54:22 -07:00
parent 9a198e4cc6
commit 60359a7045
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
e107_plugins/news/news.php
View File

@ -80,11 +80,16 @@ class news_front
private function setBreadcrumb()
{
$this->addDebug('setBreadcrumb', 'complete');
$breadcrumb = array();
$breadcrumb[] = array('text'=> LAN_PLUGIN_NEWS_NAME, 'url'=>e107::url('news', 'index'));
if(empty($this->currentRow['category_name']))
{
$this->addDebug("Possible Issue", "missing category_name on this->currentRow");
}
$categoryName = e107::getParser()->toHTML($this->currentRow['category_name'],true, 'TITLE');
switch($this->route)
@ -94,7 +99,7 @@ class news_front
$breadcrumb[0]['url'] = null;
break;
case "news/view":
case "news/view/item":
$itemName = e107::getParser()->toHTML($this->currentRow['news_title'],true, 'TITLE');
@ -128,7 +133,7 @@ class news_front
default:
if(ADMIN)
{
$breadcumb[] = array('text'=> "Missing News breadcrumb for route: ".$this->route);
$breadcrumb[] = array('text'=> "Missing News breadcrumb for route: ".$this->route);
}
break;
}
@ -369,7 +374,6 @@ class news_front
}
$this->route = 'news/'.$newsRoute;
$tp = e107::getParser();
@ -777,6 +781,8 @@ class news_front
$e107cache->set($cache_tag, $cache_data);
$e107cache->set($cache_tag."_caption", $this->caption);
$this->addDebug('Cache Caption', $this->caption);
$e107cache->set($cache_tag."_title", e107::getSingleton('eResponse')->getMetaTitle());
$e107cache->set($cache_tag."_diz", defined("META_DESCRIPTION") ? META_DESCRIPTION : '');
@ -796,11 +802,16 @@ class news_front
{
$cachetag .= "_".$type;
}
$this->addDebug('CaheString lookup', $cachetag);
$this->addDebug('CacheString lookup', $cachetag);
e107::getDebug()->log('Retrieving cache string:' . $cachetag);
$ret = e107::getCache()->setMD5(null)->retrieve($cachetag);
if(empty($ret))
{
$this->addDebug('Possible Issue', $cachetag." is empty");
}
if($type == 'rows')
{
return e107::unserialize($ret);
@ -1181,6 +1192,7 @@ class news_front
{
$this->addDebug("Cache",'active');
$rows = $this->getNewsCache($this->cacheString,'rows');
$this->currentRow = $rows;
$caption = $this->getNewsCache($this->cacheString,'caption');
e107::getEvent()->trigger('user_news_item_viewed', $rows);
$this->addDebug("Event-triggered:user_news_item_viewed", $rows);
@ -1294,7 +1306,7 @@ class news_front
if(defset('THEME_VERSION') === 2.3 || (isset($tmp['caption']) && $tmp['caption'] !== null)) // to initiate tablerender() usage.
{
$this->addDebug('Internal Route', $this->route);
$this->route = 'news/view'; // used for tablerender id.
$this->templateKey = $newsViewTemplate; // used for tablerender id.
$nsc = e107::getScBatch('news')->setScVar('news_item', $news); // Allow any news shortcode to be used in the 'caption'.
@ -1309,6 +1321,9 @@ class news_front
$this->currentRow = $news;
$this->caption = $caption;
$cache_data = $this->ix->render_newsitem($news, 'extend', '', $template, $param);
$this->setNewsCache($this->cacheString, $cache_data, $news);
@ -1327,9 +1342,8 @@ class news_front
$ns->setUniqueId(null); // prevent other tablerenders from using this content.
// TODO add 'image' and 'icon'?
$this->caption = $caption;
$text = $cache_data;
$text = $cache_data;
}
else
{