1 files changed, 6 insertions, 7 deletions

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index d995e8a30..4f2129c70 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -182,8 +182,8 @@ if (!class_exists('configuration')) {
       if ($this->_format == 'php') {
           $out .= '<'.'?php'."\n".
                 "/*\n".
-                " * ".$header." \n".
-                " * Auto-generated by ".$id." plugin \n".
+                " * ".$header."\n".
+                " * Auto-generated by ".$id." plugin\n".
                 " * Run for user: ".$_SERVER['REMOTE_USER']."\n".
                 " * Date: ".date('r')."\n".
                 " */\n\n";
@@ -343,7 +343,7 @@ if (!class_exists('setting')) {
     var $_cautionList = array(
         'basedir' => 'danger', 'baseurl' => 'danger', 'savedir' => 'danger', 'useacl' => 'danger', 'authtype' => 'danger', 'superuser' => 'danger', 'userewrite' => 'danger',
         'start' => 'warning', 'camelcase' => 'warning', 'deaccent' => 'warning', 'sepchar' => 'warning', 'compression' => 'warning', 'xsendfile' => 'warning', 'renderer_xhtml' => 'warning',
-        'allowdebug' => 'security', 'htmlok' => 'security', 'phpok' => 'security', 'iexssprotect' => 'security', 'xmlrpc' => 'security'
+        'allowdebug' => 'security', 'htmlok' => 'security', 'phpok' => 'security', 'iexssprotect' => 'security', 'xmlrpc' => 'security', 'fnencode' => 'warning'
     );
 
     function setting($key, $params=NULL) {
@@ -528,8 +528,6 @@ if (!class_exists('setting_password')) {
 }
 
 if (!class_exists('setting_email')) {
-
-  require_once(DOKU_INC.'inc/mail.php');
   if (!defined('SETTING_EMAIL_PATTERN')) define('SETTING_EMAIL_PATTERN','<^'.PREG_PATTERN_VALID_EMAIL.'$>');
 
   class setting_email extends setting_string {
@@ -599,7 +597,7 @@ if (!class_exists('setting_richemail')) {
           $addr = $test;
         }
 
-        if (!mail_isvalid($addr)) {
+        if ($test !== '' && !mail_isvalid($addr)) {
           $this->_error = true;
           $this->_input = $input;
           return false;
@@ -629,7 +627,8 @@ if (!class_exists('setting_numeric')) {
       $out = '';
 
       if ($fmt=='php') {
-        $out .=  '$'.$var."['".$this->_out_key()."'] = ".$this->_local.";\n";
+        $local = $this->_local === '' ? "''" : $this->_local;
+        $out .=  '$'.$var."['".$this->_out_key()."'] = ".$local.";\n";
       }
 
     return $out;