From 20e146f6260eaf96aaea21c11c09f45987b3bf2b Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 3 Mar 2017 09:28:28 -0800
Subject: [PATCH] Fixes #2475 - Default news template fix.

---
 e107_plugins/news/news.php                    | 32 ++++++++++++++-----
 e107_plugins/news/templates/news_template.php |  8 ++++-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
index ea4c15ae5..88114ce0d 100644
--- a/e107_plugins/news/news.php
+++ b/e107_plugins/news/news.php
@@ -851,7 +851,7 @@ class news_front
 
 		$text = '';
 
-		if(vartrue($template['start']))
+		if(!empty($template['start']))
 		{
 			$text .= $tp->parseTemplate($template['start'], true);
 		}
@@ -868,7 +868,7 @@ class news_front
 			$text .= "<div class='news-empty'><div class='alert alert-info'>".(strstr(e_QUERY, "month") ? LAN_NEWS_462 : LAN_NEWS_83)."</div></div>";
 		}
 
-		if(vartrue($template['end']))
+		if(!empty($template['end']))
 		{
 			$text .= $tp->parseTemplate($template['end'], true);
 		}
@@ -891,7 +891,7 @@ class news_front
 
 		$text  		.= $tp->parseTemplate("{NEXTPREV={$parms}}");
 
-		if(varset($template['caption'])) // v2.x
+		if(isset($template['caption'])) // v2.x
 		{
 			$NEWSLISTTITLE = str_replace("{NEWSCATEGORY}",$tp->toHTML($category_name,FALSE,'TITLE'), $template['caption']);
 		}
@@ -1460,6 +1460,7 @@ class news_front
 				unset($tmp);
 			}
 			*/
+			//@todo remove
 			if (!defined("DATEHEADERCLASS")) {
 				define("DATEHEADERCLASS", "nextprev");
 				// if not defined in the theme, default class nextprev will be used for new date header
@@ -1479,15 +1480,20 @@ class news_front
 			}
 			else
 			{
-				$tmp = e107::getTemplate('news', 'news', 'default'); // default - we show the full items, except for the 'extended' part..
-				$template = $tmp['item'];
-				unset($tmp);
+				$tmpl = e107::getTemplate('news', 'news', 'default'); // default - we show the full items, except for the 'extended' part..
+				$template = $tmpl['item'];
+			//	unset($tmp);
 			}
 
 
 
-			// NEW - news category title when in list
-			if($sub_action && 'list' == $action && vartrue($newsAr[1]['category_name']))
+			if(!empty($tmpl['start'])) //v2.1.5
+			{
+				$nsc = e107::getScBatch('news')->setScVar('news_item', $newsAr[1])->setScVar('param', $param);
+				echo $tp->parseTemplate($tmpl['start'],true,$nsc);
+
+			}
+			elseif($sub_action && 'list' == $action && vartrue($newsAr[1]['category_name'])) //old
 			{
 				// we know category name - pass it to the nexprev url
 				$category_name = $newsAr[1]['category_name'];
@@ -1503,6 +1509,7 @@ class news_front
 				echo $NEWSLISTCATTITLE;
 			}
 
+
 			$i= 1;
 
 			$socialInstalled = e107::isInstalled('social');
@@ -1550,6 +1557,15 @@ class news_front
 				$i++;
 			}
 
+			if(!empty($tmpl['end']))
+			{
+				$nsc = e107::getScBatch('news')->setScVar('news_item', $newsAr[1])->setScVar('param', $param);
+				echo $tp->parseTemplate($tmpl['end'], true, $nsc);
+			}
+
+
+
+
 			$amount = ITEMVIEW;
 			$nitems = defined('NEWS_NEXTPREV_NAVCOUNT') ? '&navcount='.NEWS_NEXTPREV_NAVCOUNT : '' ;
 			$url = rawurlencode(e107::getUrl()->create($this->route, $this->newsUrlparms));
diff --git a/e107_plugins/news/templates/news_template.php b/e107_plugins/news/templates/news_template.php
index 1f93c3366..1441ffe36 100644
--- a/e107_plugins/news/templates/news_template.php
+++ b/e107_plugins/news/templates/news_template.php
@@ -80,8 +80,14 @@ $NEWS_TEMPLATE['default']['item'] = '
 ';
 */
 
+
+
+
+
 $NEWS_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
 
+
+$NEWS_TEMPLATE['default']['start']	= '';
 $NEWS_TEMPLATE['default']['item'] = '
 		{SETIMAGE: w=400&h=400}
 		<div class="default-item">
@@ -110,7 +116,7 @@ $NEWS_TEMPLATE['default']['item'] = '
 		</div>
 ';
 
-
+$NEWS_TEMPLATE['default']['end']	= '';
 
 ###### Default view item (temporary)  ######
 //$NEWS_MENU_TEMPLATE['view']['start']       = '<ul class="nav nav-list news-menu-months">';