1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 20:51:53 +02:00

Fixed: Latest News Menu was not using {SETIMAGE} value.

This commit is contained in:
Cameron 2016-02-06 18:33:35 -08:00
parent 5daaaedf99
commit 0e2c7ad2e7
2 changed files with 23 additions and 5 deletions

View File

@ -51,9 +51,16 @@ class news_shortcodes extends e_shortcode
}
}
function sc_newstitle()
function sc_newstitle($parm)
{
return e107::getParser()->toHTML($this->news_item['news_title'], TRUE, 'TITLE');
$text = e107::getParser()->toHTML($this->news_item['news_title'], TRUE, 'TITLE');
if(!empty($parm['attribute']))
{
$text = e107::getParser()->toAttribute($text);
}
return $text;
}
function sc_newsurltitle()

View File

@ -683,9 +683,15 @@ class e_news_tree extends e_front_tree_model
$batch->wrapper('news_menu/latest'); //@SecretR - Please FIXME, I'm lost in here. (Cam)
$i = 1;
foreach ($this->getTree() as $news)
$items = $this->getTree();
if(!empty($items))
{
$start = $parser->parseTemplate($template['start'], true, $vars); // must be here in case {SETIMAGE} is present and used for items below.
}
foreach ($items as $news)
{
$vars->counter = $i;
$batch->setScVar('news_item', $news->getData());
@ -693,10 +699,15 @@ class e_news_tree extends e_front_tree_model
$i++;
}
if(!empty($items))
{
$end = $parser->parseTemplate($template['end'], true, $vars);
}
if($ret)
{
$separator = varset($template['separator'], '');
$ret = $parser->simpleParse($template['start'], $vars).implode($separator, $ret).$parser->simpleParse($template['end'], $vars);
$ret = $start.implode($separator, $ret).$end;
$return = isset($parms['return']) ? true : false;
if($tablerender)