Merge branch 'master' of git+ssh://git@github.com/s9y/Serendipity.git

This commit is contained in:
Grischa Brockhaus 2012-06-13 15:27:35 +02:00
commit d6c4f8a4de
2 changed files with 2 additions and 2 deletions

View File

@ -729,7 +729,7 @@ function &serendipity_smarty_printComments($params, &$smarty) {
$params['order'] = 'ASC';
}
$comments = serendipity_fetchComments($params['entry'], (int)$params['limit'], $params['order']);
$comments = serendipity_fetchComments($params['entry'], (int)$params['limit'], 'co.id ' . $params['order']);
if (!empty($serendipity['POST']['preview'])) {
$comments[] =

View File

@ -90,7 +90,7 @@ switch ($_GET['type']) {
case 'comments_and_trackbacks':
case 'trackbacks':
case 'comments':
$entries = serendipity_fetchComments(isset($_GET['cid']) ? $_GET['cid'] : null, $serendipity['RSSfetchLimit'], 'desc', false, $_GET['type']);
$entries = serendipity_fetchComments(isset($_GET['cid']) ? $_GET['cid'] : null, $serendipity['RSSfetchLimit'], 'co.id desc', false, $_GET['type']);
$description = $title . ' - ' . $description;
if (isset($_GET['cid'])) {
$title = $title . ' - ' . COMMENTS_FROM . ' "' . $latest_entry[0]['title'] . '"';