Dashboard: Also show drafts
This commit is contained in:
@ -23,15 +23,17 @@ $data['usedVersion'] = $serendipity['version'];
|
||||
$data['update'] = version_compare($data['usedVersion'], $data['curVersion'], '<');
|
||||
|
||||
|
||||
$data['comments'] = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c
|
||||
$comments = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c
|
||||
LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
|
||||
ORDER BY c.id DESC LIMIT 5");
|
||||
foreach ($data['comments'] as &$comment) {
|
||||
foreach ($comments as &$comment) {
|
||||
$entrylink = serendipity_archiveURL($comment['entry_id'], 'comments', 'serendipityHTTPPath', true) . '#c' . $comment['id'];
|
||||
$comment['entrylink'] = $entrylink;
|
||||
}
|
||||
|
||||
$data['entries'] = serendipity_fetchEntries(
|
||||
$data['comments'] = $comments;
|
||||
|
||||
$entries = serendipity_fetchEntries(
|
||||
false,
|
||||
false,
|
||||
5,
|
||||
@ -41,6 +43,23 @@ $data['entries'] = serendipity_fetchEntries(
|
||||
'e.timestamp >= ' . serendipity_serverOffsetHour()
|
||||
);
|
||||
|
||||
$entriesAmount = count($data['entries']);
|
||||
if ($entriesAmount < 5) {
|
||||
// there is still space for drafts
|
||||
$drafts = serendipity_fetchEntries(
|
||||
false,
|
||||
false,
|
||||
5- $entriesAmount,
|
||||
true,
|
||||
false,
|
||||
'timestamp DESC',
|
||||
'isdraft = "true" AND e.timestamp <= ' . serendipity_serverOffsetHour()
|
||||
);
|
||||
$entries = array_merge($entries, $drafts);
|
||||
}
|
||||
|
||||
$data['entries'] = $entries;
|
||||
|
||||
$data['token'] = serendipity_setFormToken('url');
|
||||
|
||||
echo serendipity_smarty_show('admin/overview.inc.tpl', $data);
|
||||
|
Reference in New Issue
Block a user