mirror of
https://github.com/e107inc/e107.git
synced 2025-08-08 15:46:44 +02:00
Issue #2678 - News Menu Template loading consistency.
This commit is contained in:
@@ -39,7 +39,7 @@ if(false === $cached)
|
|||||||
$parms['tmpl_key'] = 'latest';
|
$parms['tmpl_key'] = 'latest';
|
||||||
}
|
}
|
||||||
|
|
||||||
$template = e107::getTemplate('news', $parms['tmpl'], $parms['tmpl_key']);
|
$template = e107::getTemplate('news', $parms['tmpl'], $parms['tmpl_key'], true, true);
|
||||||
|
|
||||||
$treeparm = array();
|
$treeparm = array();
|
||||||
if(vartrue($parms['count'])) $treeparm['db_limit'] = '0, '.intval($parms['count']);
|
if(vartrue($parms['count'])) $treeparm['db_limit'] = '0, '.intval($parms['count']);
|
||||||
|
@@ -28,7 +28,7 @@ if(false === $cached)
|
|||||||
$parms['tmpl'] = 'news_menu';
|
$parms['tmpl'] = 'news_menu';
|
||||||
$parms['tmpl_key'] = 'category';
|
$parms['tmpl_key'] = 'category';
|
||||||
|
|
||||||
$template = e107::getTemplate('news', $parms['tmpl'], $parms['tmpl_key']);
|
$template = e107::getTemplate('news', $parms['tmpl'], $parms['tmpl_key'], true, true);
|
||||||
|
|
||||||
$cached = $ctree->loadActive()->render($template, $parms, true);
|
$cached = $ctree->loadActive()->render($template, $parms, true);
|
||||||
e107::getCache()->set($cacheString, $cached);
|
e107::getCache()->set($cacheString, $cached);
|
||||||
|
@@ -108,7 +108,7 @@ if(false === $cached)
|
|||||||
|
|
||||||
// go over the link array and create the option fields
|
// go over the link array and create the option fields
|
||||||
$menu_text = array();
|
$menu_text = array();
|
||||||
$template = e107::getTemplate('news', 'news_menu', 'months');
|
$template = e107::getTemplate('news', 'news_menu', 'months', true, true);
|
||||||
$bullet = defined('BULLET') ? THEME_ABS.'images/'.BULLET : THEME_ABS.'images/bullet2.gif';
|
$bullet = defined('BULLET') ? THEME_ABS.'images/'.BULLET : THEME_ABS.'images/bullet2.gif';
|
||||||
$vars = new e_vars(array('bullet' => $bullet));
|
$vars = new e_vars(array('bullet' => $bullet));
|
||||||
foreach($month_links as $index => $val)
|
foreach($month_links as $index => $val)
|
||||||
|
@@ -51,7 +51,7 @@ if(!$OTHERNEWS2_STYLE)
|
|||||||
define("OTHERNEWS_COLS",false);
|
define("OTHERNEWS_COLS",false);
|
||||||
}
|
}
|
||||||
|
|
||||||
$template = e107::getTemplate('news', 'news_menu', 'other2');
|
$template = e107::getTemplate('news', 'news_menu', 'other2', true, true);
|
||||||
$OTHERNEWS2_STYLE = $template['item'];
|
$OTHERNEWS2_STYLE = $template['item'];
|
||||||
|
|
||||||
if(!empty($parms['caption']))
|
if(!empty($parms['caption']))
|
||||||
|
@@ -55,7 +55,7 @@ if(!$OTHERNEWS_STYLE)
|
|||||||
{
|
{
|
||||||
define("OTHERNEWS_COLS",false);
|
define("OTHERNEWS_COLS",false);
|
||||||
}
|
}
|
||||||
$template = e107::getTemplate('news', 'news_menu', 'other');
|
$template = e107::getTemplate('news', 'news_menu', 'other', true, true);
|
||||||
|
|
||||||
$item_selector = '<div class="btn-group pull-right"><a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="prev">‹</a>
|
$item_selector = '<div class="btn-group pull-right"><a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="prev">‹</a>
|
||||||
<a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="next">›</a></div>';
|
<a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="next">›</a></div>';
|
||||||
|
Reference in New Issue
Block a user