From d8edd18c1016607e809b60a67355ce16103553fd Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 22 Jan 2016 19:47:09 +0100 Subject: [PATCH] Fix show Dashboard entries by authors entries References #385 and http://board.s9y.org/viewtopic.php?f=10&t=20639 We might need to extend this with user group policies (userlevel) - it depends on what we want to have here. @garvinhicking --- docs/NEWS | 4 +++- include/admin/overview.inc.php | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/NEWS b/docs/NEWS index 45567819..29f78dff 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -1,7 +1,9 @@ Version 2.1 () ------------------------------------------------------------------------ - * Fix Dashboard comments by authors entries (#385) + * Fix show Dashboard entries by authors entries + + * Fix show Dashboard comments by authors entries (#385) * Use CDATA encoded body for ATOM feed diff --git a/include/admin/overview.inc.php b/include/admin/overview.inc.php index 7a08936d..758822c2 100644 --- a/include/admin/overview.inc.php +++ b/include/admin/overview.inc.php @@ -65,8 +65,8 @@ if (!isset($serendipity['dashboardDraftLimit'])) { $cjoin = ($serendipity['authorid'] > 1) ? " LEFT JOIN {$serendipity['dbPrefix']}authors a ON (e.authorid = a.authorid) - WHERE e.authorid = {$serendipity['authorid']} - " : ''; + WHERE e.authorid = " . (int)$serendipity['authorid'] + : ''; $cquery = "SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id) @@ -93,7 +93,7 @@ if (is_array($comments) && count($comments) > 0) { $data['comments'] = $comments; - +$efilter = ($serendipity['authorid'] > 1) ? ' AND e.authorid = ' . (int)$serendipity['authorid'] : ''; $entries = serendipity_fetchEntries( false, false, @@ -101,7 +101,7 @@ $entries = serendipity_fetchEntries( true, false, 'timestamp DESC', - 'e.timestamp >= ' . serendipity_serverOffsetHour() + 'e.timestamp >= ' . serendipity_serverOffsetHour() . $efilter ); $entriesAmount = count($entries); @@ -114,7 +114,7 @@ if ($entriesAmount < (int)$serendipity['dashboardDraftLimit']) { true, false, 'timestamp DESC', - "isdraft = 'true' AND e.timestamp <= " . serendipity_serverOffsetHour() + "isdraft = 'true' AND e.timestamp <= " . serendipity_serverOffsetHour() . $efilter ); if (is_array($entries) && is_array($drafts)) { $entries = array_merge($entries, $drafts);