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

issue #430

Browse Source
This commit is contained in:
Garvin Hicking 2017-01-26 08:23:17 +01:00
parent 5bf0cf9fea
commit 97277cfd1a
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@ -1,6 +1,9 @@
Version 2.1-rc1 (January, 26th 2017) Version 2.1-rc1 (January, 26th 2017)
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Issue #430, fix proper name of new feedShowMail configuration var
in rss.php for showing mail addresses
* [Security] Enhance CSRF-Tokens for toggling/moderating comments * [Security] Enhance CSRF-Tokens for toggling/moderating comments
* Allow to set a default category for authors (personal preferences) * Allow to set a default category for authors (personal preferences)

2
rss.php
View File

@ -244,7 +244,7 @@ if ($_GET['type'] == 'content' &&
header('Location: ' . serendipity_get_config_var('feedCustom')); header('Location: ' . serendipity_get_config_var('feedCustom'));
exit; exit;
} }
$metadata['showMail'] = serendipity_db_bool(serendipity_get_config_var('show_mail', $metadata['showMail'])); $metadata['showMail'] = serendipity_db_bool(serendipity_get_config_var('feedShowMail', $metadata['showMail']));
$file_version = preg_replace('@[^0-9a-z\.-_]@i', '', $version); $file_version = preg_replace('@[^0-9a-z\.-_]@i', '', $version);
$metadata['template_file'] = 'feed_' . $file_version . '.tpl'; $metadata['template_file'] = 'feed_' . $file_version . '.tpl';

2
serendipity_config.inc.php
View File

@ -47,7 +47,7 @@ if (defined('USE_MEMSNAP')) {
} }
// The version string // The version string
$serendipity['version'] = '2.1-beta3'; $serendipity['version'] = '2.1-rc1';
// Setting this to 'false' will enable debugging output. All alpha/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'. // Setting this to 'false' will enable debugging output. All alpha/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.