From d075e4807e16e36a851ada40d28471fcdfbc34eb Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 30 Aug 2016 11:19:12 -0700
Subject: [PATCH] Issue #6 #1816 Removed shortcodes from LAN definition.

---
 e107_admin/includes/infopanel.php          | 5 ++++-
 e107_languages/English/admin/lan_admin.php | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index 94f42b51e..0388786fb 100644
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -522,6 +522,9 @@ class adminstyle_infopanel
 		
 		//XXX Always keep template hardcoded here - heavy use of ajax and ids. 
 		$count = 1;
+
+		$lanVar = array('x' =>'{USERNAME}', 'y'=>'{TIMEDATE=relative}');
+				
 		foreach($rows as $row) 
 		{
 			$hide = ($count > 3) ? ' hide' : '';
@@ -534,7 +537,7 @@ class adminstyle_infopanel
 	            	<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='approve' class='btn btn-sm btn-mini btn-success'><i class='icon-ok'></i> ".LAN_APPROVE."</button>
 	            </div>
 				<div class='media-body'>
-					<small class='muted smalltext'>".LAN_POSTED_BY_X."</small><br />
+					<small class='muted smalltext'>".$tp->lanVars(LAN_POSTED_BY_X, $lanVar)."</small><br />
 					<p>{COMMENT}</p> 
 				</div>
 				</li>";
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 6b7d0a454..1659f1998 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -289,7 +289,7 @@ define("LAN_ACTIVE","Active");
 define("LAN_ACCEPT","Accept");
 define("LAN_PENDING","Pending");
 define("LAN_SUBMITTED","Submitted");
-define("LAN_POSTED_BY_X","Posted by {USERNAME} {TIMEDATE=relative}");
+define("LAN_POSTED_BY_X","Posted by [x] [y]");
 define("LAN_VIEW_ALL","View All");
 
 define("LAN_BAN","Ban");
@@ -441,4 +441,4 @@ define("LAN_ADVANCED", "Advanced");
 define("LAN_FOLDER", "Folder");
 
 
-// TODO - move e_form related LANS below, add new lan_form.php file (for both front/back-end)
+