X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=6e588208ab4f283dccfc900e8b9141d3e70b0b30;hb=44e3eff0aa6e7bdb7f4ecd9ee1ddf141e1b68af3;hp=74e28d8b19c50d8f35f4aa897cbeed0f22f91b38;hpb=99a8652052e5b036e7db08c32603c0feadc60e85;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 74e28d8b1..6e588208a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -134,7 +134,7 @@ sub set {
   my $dir = $self->dir;
   $value =~ /^(.*)$/s;
   $value = $1;
-  unless ( $self->config($file) eq $value ) {
+  unless ( join("\n", @{[ $self->config($file) ]}) eq $value ) {
     warn "[FS::Conf] SET $file\n" if $DEBUG;
 #    warn "$dir" if is_tainted($dir);
 #    warn "$dir" if is_tainted($file);
@@ -865,6 +865,21 @@ httemplate/docs/config.html
     'select_enum' => [ qw(en_US) ],
   },
 
+  {
+    'key'         => 'signup_server-payby',
+    'section'     => '',
+    'description' => 'Acceptable payment types for the signup server',
+    'type'        => 'selectmultiple',
+    'select_enum' => [ qw(CARD PREPAY BILL COMP) ],
+  },
+
+  {
+    'key'         => 'show-msgcat-codes',
+    'section'     => 'UI',
+    'description' => 'Show msgcat codes in error messages.  Turn this option on before reporting errors to the mailing list.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;