From 71c986ed29cfe7b2dfc63497125aa94828fa226c Mon Sep 17 00:00:00 2001 From: onli Date: Sun, 7 Jul 2013 23:04:19 +0200 Subject: [PATCH] dashboard: don't die when no entries exist --- include/admin/overview.inc.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/admin/overview.inc.php b/include/admin/overview.inc.php index 1eb05ea0..759fdfe6 100644 --- a/include/admin/overview.inc.php +++ b/include/admin/overview.inc.php @@ -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 LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id) ORDER BY c.id DESC LIMIT 5"); -foreach ($comments as &$comment) { - $entrylink = serendipity_archiveURL($comment['entry_id'], 'comments', 'serendipityHTTPPath', true) . '#c' . $comment['id']; - $comment['entrylink'] = $entrylink; +if (count($comments) > 1) { + foreach ($comments as &$comment) { + $entrylink = serendipity_archiveURL($comment['entry_id'], 'comments', 'serendipityHTTPPath', true) . '#c' . $comment['id']; + $comment['entrylink'] = $entrylink; + } } $data['comments'] = $comments; @@ -55,7 +57,11 @@ if ($entriesAmount < 5) { 'timestamp DESC', '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;