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

Fix show Dashboard entries by authors entries

Browse Source 
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
This commit is contained in:
Ian 2016-01-22 19:47:09 +01:00
parent 97c43af83e
commit d8edd18c10
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/NEWS
View File

@ -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

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

@ -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);