diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php index cb6a86726..0ee5c3530 100644 --- a/e107_core/shortcodes/batch/news_shortcodes.php +++ b/e107_core/shortcodes/batch/news_shortcodes.php @@ -1245,7 +1245,7 @@ class news_shortcodes extends e_shortcode } /** - * {NEWS_NAV_PREVIOUS} + * {NEWS_NAV_CURRENT} * @return string|null */ function sc_news_nav_current() diff --git a/e107_plugins/news/latestnews_menu.php b/e107_plugins/news/latestnews_menu.php index b384801e2..d19a280ad 100644 --- a/e107_plugins/news/latestnews_menu.php +++ b/e107_plugins/news/latestnews_menu.php @@ -46,9 +46,17 @@ if(false === $cached) if(vartrue($parms['count'])) $treeparm['db_limit'] = '0, '.intval($parms['count']); if(vartrue($parms['order'])) $treeparm['db_order'] = e107::getParser()->toDb($parms['order']); $parms['return'] = true; - + + /* Prevent data-overwrite if menu is called within news template and more news shortcodes are called after */ + $origParam = e107::getScBatch('news')->getScVar('param'); + $origData = e107::getScBatch('news')->getScVar('news_item'); + $cached = $ntree->loadJoinActive(vartrue($parms['category'], 0), false, $treeparm)->render($template, $parms, true); e107::getCache()->set($cacheString, $cached); + + e107::getScBatch('news')->setScVar('param', $origParam); + e107::getScBatch('news')->setScVar('news_item', $origData); + } echo $cached;