mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

dashboard: don't die when no entries exist

Browse Source
This commit is contained in:
onli
2013-07-07 23:04:19 +02:00
parent 5d99bd934e
commit 71c986ed29
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/admin/overview.inc.php
View File

@@ -26,9 +26,11 @@ $data['update'] = version_compare($data['usedVersion'], $data['curVersion'], '<'
$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) LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
ORDER BY c.id DESC LIMIT 5"); ORDER BY c.id DESC LIMIT 5");
foreach ($comments as &$comment) { if (count($comments) > 1) {
$entrylink = serendipity_archiveURL($comment['entry_id'], 'comments', 'serendipityHTTPPath', true) . '#c' . $comment['id']; foreach ($comments as &$comment) {
$comment['entrylink'] = $entrylink; $entrylink = serendipity_archiveURL($comment['entry_id'], 'comments', 'serendipityHTTPPath', true) . '#c' . $comment['id'];
$comment['entrylink'] = $entrylink;
}
} }
$data['comments'] = $comments; $data['comments'] = $comments;
@@ -55,7 +57,11 @@ if ($entriesAmount < 5) {
'timestamp DESC', 'timestamp DESC',
'isdraft = "true" AND e.timestamp <= ' . serendipity_serverOffsetHour() 'isdraft = "true" AND e.timestamp <= ' . serendipity_serverOffsetHour()
); );
$entries = array_merge($entries, $drafts); if (count($entries) > 1) {
$entries = array_merge($entries, $drafts);
} else {
$entries = $drafts;
}
} }
$data['entries'] = $entries; $data['entries'] = $entries;