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

Merge pull request #2124 from rica-carv/rica-carv-patch-2

Browse Source 
Bug in forum shortcodes. Sorry...
This commit is contained in:
Cameron
2016-12-07 09:40:06 -08:00
committed by GitHub
parent b422906eca b96ce5ee0f
commit bdff197b3d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
View File

@@ -507,7 +507,7 @@ class forum_shortcodes extends e_shortcode
// code to be executed if n is different from all labels;
}
}
return $relativeDate.'<br />'.$lastpost_username." <a href='".$url."'>".IMAGE_post2.'</a>';
return $lastpost_username." <a href='".$url."'>".$relativeDate.'</a>';
}
function sc_startertitle()

4
e107_plugins/forum/templates/forum_template.php
View File

@@ -134,9 +134,11 @@ $FORUM_TEMPLATE['main']['forum'] = "<tr>
<td>{FORUMNAME}<br /><small>{FORUMDESCRIPTION}</small>{FORUMSUBFORUMS}</td>
<td class='hidden-xs text-center'>{REPLIESX}</td>
<td class='text-center'>{THREADSX}</td>
<td class='hidden-xs text-center'><small>{LASTPOSTUSER} {LASTPOSTDATE}</small></td>
<td class='hidden-xs text-center'><small>{LASTPOST:type=username} {LASTPOST:type=datelink}</small></td>
</tr>";
//{LASTPOST:type=username} + {LASTPOST:type=datelink} can also be replaced by the legacy shortcodes {LASTPOST} or {LASTPOSTUSER} + {LASTPOSTDATE}
$FORUM_TEMPLATE['main']['end'] = "</table><div class='forum-footer center'><small>{USERINFOX}</small></div></div>";
// $FORUM_WRAPPER['main']['forum']['USERINFOX'] = "{FORUM_BREADCRUMB}(html before){---}(html after)";