Skip to content
Snippets Groups Projects
Commit 1115fba0 authored by Dries Buytaert's avatar Dries Buytaert
Browse files

- Patch #489880 by nbz, Bojhan, Gurpartap Singh: merge 'Created' column with 'Topics'.

parent 82d912d8
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
......@@ -18,11 +18,12 @@
*/
?>
<?php if ($time): ?>
<?php print t(
'@time ago<br />by !author', array(
<span class="submitted">
<?php print t('By !author @time ago', array(
'@time' => $time,
'!author' => $author,
)); ?>
</span>
<?php else: ?>
<?php print t('n/a'); ?>
<?php endif; ?>
......@@ -41,7 +41,14 @@
<?php foreach ($topics as $topic): ?>
<tr class="<?php print $topic->zebra;?>">
<td class="icon"><?php print $topic->icon; ?></td>
<td class="title"><?php print $topic->title; ?></td>
<td class="title">
<div>
<?php print $topic->title; ?>
</div>
<div>
<?php print $topic->created; ?>
</div>
</td>
<?php if ($topic->moved): ?>
<td colspan="3"><?php print $topic->message; ?></td>
<?php else: ?>
......@@ -52,7 +59,6 @@
<a href="<?php print $topic->new_url; ?>"><?php print $topic->new_text; ?></a>
<?php endif; ?>
</td>
<td class="created"><?php print $topic->created; ?></td>
<td class="last-reply"><?php print $topic->last_reply; ?></td>
<?php endif; ?>
</tr>
......
......@@ -691,7 +691,6 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
NULL,
array('data' => t('Topic'), 'field' => 'n.title'),
array('data' => t('Replies'), 'field' => 'ncs.comment_count'),
array('data' => t('Created'), 'field' => 'n.created'),
array('data' => t('Last reply'), 'field' => 'ncs.last_comment_timestamp'),
);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment