From 97277cfd1a534190de3d43fc9041213ba710156f Mon Sep 17 00:00:00 2001
From: Garvin Hicking <blog@garv.in>
Date: Thu, 26 Jan 2017 08:23:17 +0100
Subject: [PATCH] issue #430

---
 docs/NEWS                  | 3 +++
 rss.php                    | 2 +-
 serendipity_config.inc.php | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index fa176e18..3b81272a 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,6 +1,9 @@
 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
 
     * Allow to set a default category for authors (personal preferences)
diff --git a/rss.php b/rss.php
index 9c75c4c3..7d3cab96 100644
--- a/rss.php
+++ b/rss.php
@@ -244,7 +244,7 @@ if ($_GET['type'] == 'content' &&
     header('Location: ' . serendipity_get_config_var('feedCustom'));
     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);
 $metadata['template_file'] = 'feed_' . $file_version . '.tpl';
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 978c31f8..8fd50be7 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -47,7 +47,7 @@ if (defined('USE_MEMSNAP')) {
 }
 
 // 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'.