From 29b405d31d8403536ccb45042110b783b1a21021 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 24 Aug 2015 10:19:34 -0700
Subject: [PATCH] Issue #6 Removed duplicate LAN_SEARCH from English.php. PHP
 Notice removal.

---
 e107_handlers/e_parse_class.php    | 7 ++++++-
 e107_languages/English/English.php | 1 -
 news.php                           | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index fee79b381..fc20438e7 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -3271,8 +3271,13 @@ class e_parser
 	 */
 	function toVideo($file, $parm=array())
 	{
+		if(empty($file))
+		{
+			return false;
+		}
+
 		list($id,$type) = explode(".",$file,2);
-		
+
 		$thumb = vartrue($parm['thumb']);
 		
 		
diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php
index 04d3efd98..87e41242a 100644
--- a/e107_languages/English/English.php
+++ b/e107_languages/English/English.php
@@ -112,7 +112,6 @@ define("LAN_TITLE", "Title");
 define("LAN_USER", "User");
 define("LAN_EMAIL","Email address");
 define("LAN_WROTE", "wrote"); // as in John wrote.."  ";
-define("LAN_SEARCH", "Search");
 define("LAN_RE_ORDER", "Re-order");
 
 define("LAN_ENTER_USRNAME_EMAIL", "Please enter your username or email"); // admin php hover field admin name
diff --git a/news.php b/news.php
index 4bf39052d..ea549f9c1 100644
--- a/news.php
+++ b/news.php
@@ -288,12 +288,14 @@ if ($action == 'cat' || $action == 'all' || vartrue($_GET['tag']))
 	$param['itemlink'] = (defined("NEWSLIST_ITEMLINK")) ? NEWSLIST_ITEMLINK : "";
 	$param['thumbnail'] =(defined("NEWSLIST_THUMB")) ? NEWSLIST_THUMB : "border:0px";
 	$param['catlink']  = (defined("NEWSLIST_CATLINK")) ? NEWSLIST_CATLINK : "";
-	$param['caticon'] =  (defined("NEWSLIST_CATICON")) ? NEWSLIST_CATICON : ICONSTYLE;
+	$param['caticon'] =  (defined("NEWSLIST_CATICON")) ? NEWSLIST_CATICON : defset('ICONSTYLE','');
 	$param['current_action'] = $action;
 
 	// NEW - allow news batch shortcode override (e.g. e107::getScBatch('news', 'myplugin', true); )
 	e107::getEvent()->trigger('news_list_parse', $newsList);
 
+	$text = '';
+
 	if(vartrue($template['start']))
 	{
 		$text .= $tp->parseTemplate($template['start'], true);