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

conflict resolution

Browse Source
This commit is contained in:
onli
2012-05-27 12:38:51 +02:00
parent 948d2f43c8 b0271a56d9
commit 302bb8ee08
4 changed files with 10 additions and 2 deletions

3
docs/NEWS

@ -4,6 +4,9 @@
Version 1.7 ()
------------------------------------------------------------------------
* For Blogs running on a non-UTF-8 language, set a Smarty constant
to indicate the actually used charset.
* Added to use MyISAM handler for s9y tables (we do not use InnoDB
features, but rely on MyISAM fulltext)

2
include/functions_entries.inc.php

@ -959,7 +959,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);

5
include/functions_smarty.inc.php

@ -873,8 +873,13 @@ function serendipity_smarty_init($vars = array()) {
$prev_smarty = $_SESSION['no_smarty'];
$_SESSION['no_smarty'] = true;
if (LANG_CHARSET != 'UTF-8') {
@define('SMARTY_RESOURCE_CHAR_SET', LANG_CHARSET);
}
// Default Smarty Engine will be used
@define('SMARTY_DIR', S9Y_PEAR_PATH . 'Smarty/libs/');
if (!class_exists('Smarty')) {
include SMARTY_DIR . 'Smarty.class.php';
}

2
include/tpl/config_local.inc.php

@ -421,7 +421,7 @@
'title' => ARCHIVE_SORT_STABLE,
'description' => ARCHIVE_SORT_STABLE_DESC,
'type' => 'bool',
'default' => true,
'default' => false,
'permission' => 'blogConfiguration'),
array('var' => 'searchsort',