mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-06-08 11:57:29 +02:00
Code Issues Releases Wiki Activity

Issue #6 #1816 Removed shortcodes from LAN definition.

Browse Source
This commit is contained in:
Cameron 2016-08-30 11:19:12 -07:00
parent 2ea362a328
commit d075e4807e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
e107_admin/includes/infopanel.php
View File

@ -522,6 +522,9 @@ class adminstyle_infopanel
//XXX Always keep template hardcoded here - heavy use of ajax and ids. //XXX Always keep template hardcoded here - heavy use of ajax and ids.
$count = 1; $count = 1;
$lanVar = array('x' =>'{USERNAME}', 'y'=>'{TIMEDATE=relative}');
foreach($rows as $row) foreach($rows as $row)
{ {
$hide = ($count > 3) ? ' hide' : ''; $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> <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>
<div class='media-body'> <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> <p>{COMMENT}</p>
</div> </div>
</li>"; </li>";

4
e107_languages/English/admin/lan_admin.php
View File

@ -289,7 +289,7 @@ define("LAN_ACTIVE","Active");
define("LAN_ACCEPT","Accept"); define("LAN_ACCEPT","Accept");
define("LAN_PENDING","Pending"); define("LAN_PENDING","Pending");
define("LAN_SUBMITTED","Submitted"); 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_VIEW_ALL","View All");
define("LAN_BAN","Ban"); define("LAN_BAN","Ban");
@ -441,4 +441,4 @@ define("LAN_ADVANCED", "Advanced");
define("LAN_FOLDER", "Folder"); define("LAN_FOLDER", "Folder");
// TODO - move e_form related LANS below, add new lan_form.php file (for both front/back-end)