1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-21 05:41:58 +02:00

FontAwesome version update. News shortcode wrapper issue corrected.

This commit is contained in:
Cameron
2016-03-10 15:13:32 -08:00
parent 4516bc910e
commit 1b2db4683e
6 changed files with 12 additions and 3 deletions

View File

@@ -327,6 +327,7 @@ if ($action == 'cat' || $action == 'all' || vartrue($_GET['tag']))
$param['catlink'] = (defined("NEWSLIST_CATLINK")) ? NEWSLIST_CATLINK : "";
$param['caticon'] = (defined("NEWSLIST_CATICON")) ? NEWSLIST_CATICON : defset('ICONSTYLE','');
$param['current_action'] = $action;
$param['template_key'] = 'list';
// NEW - allow news batch shortcode override (e.g. e107::getScBatch('news', 'myplugin', true); )
e107::getEvent()->trigger('news_list_parse', $newsList);
@@ -502,6 +503,7 @@ if ($action == 'extend')
$param = array();
$param['current_action'] = $action;
$param['template_key'] = 'view';
if(vartrue($NEWSSTYLE))
{
@@ -852,6 +854,7 @@ else
// #### normal newsitems, rendered via render_newsitem(), the $query is changed above (no other changes made) ---------
$param = array();
$param['current_action'] = $action;
$param['template_key'] = 'default';
// Get Correct Template
// XXX we use $NEWSLISTSTYLE above - correct as we are currently in list mode - XXX No this is not NEWSLISTSTYLE - which provides only summaries.