mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

More news cache fixes.

Browse Source
This commit is contained in:
Cameron
2017-10-02 19:35:57 -07:00
parent 68b87444d3
commit 5940161334
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
e107_plugins/news/news.php
View File

@@ -111,11 +111,9 @@ class news_front
{ {
$tmp = explode('/',$this->route); $tmp = explode('/',$this->route);
$tmp[] = $this->templateKey; if(!empty($this->templateKey))
if(!empty($this->categorySEF))
{ {
$tmp[] = $this->categorySEF; $tmp[] = $this->templateKey;
} }
$unique = implode('-',$tmp); $unique = implode('-',$tmp);
@@ -1555,41 +1553,25 @@ class news_front
elseif(!empty($newsAr[1]['category_template']) && !empty($layout[$catTemplate])) // defined by news_category field. elseif(!empty($newsAr[1]['category_template']) && !empty($layout[$catTemplate])) // defined by news_category field.
{ {
$this->templateKey = $catTemplate; $this->templateKey = $catTemplate;
$this->categorySEF = $newsAr[1]['category_sef'];
$tmpl = $layout[$this->templateKey]; $tmpl = $layout[$this->templateKey];
// $template = $tmpl['item'];
$param['template_key'] = 'news/'.$this->templateKey; $param['template_key'] = 'news/'.$this->templateKey;
} }
elseif($this->action === 'list' && isset($layout['category']) && !isset($layout['category']['body'])) // make sure it's not old news_categories.sc elseif($this->action === 'list' && isset($layout['category']) && !isset($layout['category']['body'])) // make sure it's not old news_categories.sc
{ {
$tmpl = $layout['category']; $tmpl = $layout['category'];
$this->templateKey = 'category'; $this->templateKey = 'category';
// $this->categorySEF = $newsAr[1]['category_sef'];
// $template = $tmpl['item'];
$param['template_key'] = 'news/category'; $param['template_key'] = 'news/category';
} }
elseif(!empty($layout[$this->defaultTemplate])) // defined by default template 'news' pref. (newspost.php?mode=main&action=settings) elseif(!empty($layout[$this->defaultTemplate])) // defined by default template 'news' pref. (newspost.php?mode=main&action=settings)
{ {
$tmpl = $layout[$this->defaultTemplate]; $tmpl = $layout[$this->defaultTemplate];
$this->templateKey = $this->defaultTemplate; $this->templateKey = $this->defaultTemplate;
if($this->route === 'news/list/category')
{
$this->categorySEF = $newsAr[1]['category_sef'];
}
} }
else // fallback. else // fallback.
{ {
$tmpl = $layout['default'] ; $tmpl = $layout['default'] ;
$this->defaultTemplate = 'default'; $this->defaultTemplate = 'default';
$this->templateKey = 'default'; $this->templateKey = 'default';
if($this->route === 'news/list/category')
{
$this->categorySEF = $newsAr[1]['category_sef'];
}
} }
$this->addDebug('Template key',$this->templateKey); $this->addDebug('Template key',$this->templateKey);