From 1a829d5273c09add0de100164ca644c2230d7679 Mon Sep 17 00:00:00 2001 From: onli Date: Mon, 8 Jul 2013 10:43:54 +0200 Subject: [PATCH] dashboard: fix entries-box --- include/admin/overview.inc.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/admin/overview.inc.php b/include/admin/overview.inc.php index 759fdfe6..104f2331 100644 --- a/include/admin/overview.inc.php +++ b/include/admin/overview.inc.php @@ -45,7 +45,7 @@ $entries = serendipity_fetchEntries( 'e.timestamp >= ' . serendipity_serverOffsetHour() ); -$entriesAmount = count($data['entries']); +$entriesAmount = count($entries); if ($entriesAmount < 5) { // there is still space for drafts $drafts = serendipity_fetchEntries( @@ -57,10 +57,13 @@ if ($entriesAmount < 5) { 'timestamp DESC', 'isdraft = "true" AND e.timestamp <= ' . serendipity_serverOffsetHour() ); - if (count($entries) > 1) { + if (is_array($entries) && is_array($drafts)) { $entries = array_merge($entries, $drafts); } else { - $entries = $drafts; + if (is_array($drafts)) { + // $entries is not an array, thus empty + $entries = $drafts; + } } }