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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_core/shortcodes/batch/news_shortcodes.php
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() function sc_newsurltitle()

15
e107_handlers/news_class.php
View File

@@ -684,8 +684,14 @@ class e_news_tree extends e_front_tree_model
$batch->wrapper('news_menu/latest'); //@SecretR - Please FIXME, I'm lost in here. (Cam) $batch->wrapper('news_menu/latest'); //@SecretR - Please FIXME, I'm lost in here. (Cam)
$i = 1; $i = 1;
$items = $this->getTree();
foreach ($this->getTree() as $news) 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; $vars->counter = $i;
$batch->setScVar('news_item', $news->getData()); $batch->setScVar('news_item', $news->getData());
@@ -693,10 +699,15 @@ class e_news_tree extends e_front_tree_model
$i++; $i++;
} }
if(!empty($items))
{
$end = $parser->parseTemplate($template['end'], true, $vars);
}
if($ret) if($ret)
{ {
$separator = varset($template['separator'], ''); $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; $return = isset($parms['return']) ? true : false;
if($tablerender) if($tablerender)