conflict resolution
This commit is contained in:
@ -4,6 +4,9 @@
|
|||||||
Version 1.7 ()
|
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
|
* Added to use MyISAM handler for s9y tables (we do not use InnoDB
|
||||||
features, but rely on MyISAM fulltext)
|
features, but rely on MyISAM fulltext)
|
||||||
|
|
||||||
|
@ -959,7 +959,7 @@ function serendipity_printEntryFooter($suffix = '.html', $totalEntries = null) {
|
|||||||
$serendipity['smarty']->assign('footer_next_page', serendipity_rewriteURL(implode('/', $uriArguments) . $suffix));
|
$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');
|
$temp = $serendipity['smarty']->getTemplateVars('footer_prev_page');
|
||||||
$serendipity['smarty']->assign('footer_prev_page', $serendipity['smarty']->getTemplateVars('footer_next_page'));
|
$serendipity['smarty']->assign('footer_prev_page', $serendipity['smarty']->getTemplateVars('footer_next_page'));
|
||||||
$serendipity['smarty']->assign('footer_next_page', $temp);
|
$serendipity['smarty']->assign('footer_next_page', $temp);
|
||||||
|
@ -873,8 +873,13 @@ function serendipity_smarty_init($vars = array()) {
|
|||||||
$prev_smarty = $_SESSION['no_smarty'];
|
$prev_smarty = $_SESSION['no_smarty'];
|
||||||
$_SESSION['no_smarty'] = true;
|
$_SESSION['no_smarty'] = true;
|
||||||
|
|
||||||
|
if (LANG_CHARSET != 'UTF-8') {
|
||||||
|
@define('SMARTY_RESOURCE_CHAR_SET', LANG_CHARSET);
|
||||||
|
}
|
||||||
|
|
||||||
// Default Smarty Engine will be used
|
// Default Smarty Engine will be used
|
||||||
@define('SMARTY_DIR', S9Y_PEAR_PATH . 'Smarty/libs/');
|
@define('SMARTY_DIR', S9Y_PEAR_PATH . 'Smarty/libs/');
|
||||||
|
|
||||||
if (!class_exists('Smarty')) {
|
if (!class_exists('Smarty')) {
|
||||||
include SMARTY_DIR . 'Smarty.class.php';
|
include SMARTY_DIR . 'Smarty.class.php';
|
||||||
}
|
}
|
||||||
|
@ -421,7 +421,7 @@
|
|||||||
'title' => ARCHIVE_SORT_STABLE,
|
'title' => ARCHIVE_SORT_STABLE,
|
||||||
'description' => ARCHIVE_SORT_STABLE_DESC,
|
'description' => ARCHIVE_SORT_STABLE_DESC,
|
||||||
'type' => 'bool',
|
'type' => 'bool',
|
||||||
'default' => true,
|
'default' => false,
|
||||||
'permission' => 'blogConfiguration'),
|
'permission' => 'blogConfiguration'),
|
||||||
|
|
||||||
array('var' => 'searchsort',
|
array('var' => 'searchsort',
|
||||||
|
Reference in New Issue
Block a user