Permalink
Browse files

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

  • Loading branch information...
garvinhicking committed May 25, 2012
2 parents ba4b629 + be0b679 commit b0271a56d9180e083d9447a1cc6bddfdb64ba092
Showing with 5 additions and 5 deletions.
  1. +2 −2 include/functions_entries.inc.php
  2. +2 −2 include/genpage.inc.php
  3. +1 −1 include/tpl/config_local.inc.php
@@ -912,7 +912,7 @@ function serendipity_printEntryFooter($suffix = '.html', $totalEntries = null) {
$totalPages = 1;
}
if (!isset($serendipity['GET']['page']) && $serendipity['archiveSortStable']) {
if (!isset($serendipity['GET']['page']) && serendipity_db_bool($serendipity['archiveSortStable'])) {
$serendipity['GET']['page'] = $totalPages;
} else if (!isset($serendipity['GET']['page'])) {
$serendipity['GET']['page'] = 1;
@@ -938,7 +938,7 @@ function serendipity_printEntryFooter($suffix = '.html', $totalEntries = null) {
$serendipity['smarty']->assign('footer_next_page', serendipity_rewriteURL(implode('/', $uriArguments) . $suffix));
}
if ($serendipity['archiveSortStable']) {
if (serendipity_db_bool($serendipity['archiveSortStable'])) {
$temp = $serendipity['smarty']->getTemplateVars('footer_prev_page');
$serendipity['smarty']->assign('footer_prev_page', $serendipity['smarty']->getTemplateVars('footer_next_page'));
$serendipity['smarty']->assign('footer_next_page', $temp);
View
@@ -130,10 +130,10 @@
// Welcome screen or whatever
default:
if (! isset($serendipity['GET']['page']) || $serendipity['archiveSortStable'] === false) {
if (!isset($serendipity['GET']['page']) || !serendipity_db_bool($serendipity['archiveSortStable'])) {
serendipity_printEntries(serendipity_fetchEntries(null, true, $serendipity['fetchLimit']));
} else {
serendipity_printEntries(serendipity_fetchEntries(null, true, $serendipity['fetchLimit'], false, false, 'timestamp ASC'));
serendipity_printEntries(array_reverse(serendipity_fetchEntries(null, true, $serendipity['fetchLimit'], false, false, 'timestamp ASC')));
}
break;
}
@@ -421,7 +421,7 @@
'title' => ARCHIVE_SORT_STABLE,
'description' => ARCHIVE_SORT_STABLE_DESC,
'type' => 'bool',
'default' => true,
'default' => false,
'permission' => 'blogConfiguration'),
array('var' => 'searchsort',

0 comments on commit b0271a5

Please sign in to comment.