diff options
author | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
commit | 88bf5db0cca989c51237c661a13078eef08b3674 (patch) | |
tree | 0a84e1b5e7fd239f57fab678bf40c5311b0064a0 /rt/lib/RT/Installer.pm | |
parent | 9c15ffe3a5ee987e30e10c6a0ad1b5bf0b2a12e3 (diff) | |
parent | e7eb845db1afab1cbdbc34ff9c387c5ac554659e (diff) |
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
Diffstat (limited to 'rt/lib/RT/Installer.pm')
-rw-r--r-- | rt/lib/RT/Installer.pm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/rt/lib/RT/Installer.pm b/rt/lib/RT/Installer.pm index c48b06c1f..ccf48966a 100644 --- a/rt/lib/RT/Installer.pm +++ b/rt/lib/RT/Installer.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -131,12 +131,6 @@ my %Meta = ( Hints => 'The password RT should use to connect to the database.', }, }, - DatabaseRequireSSL => { - Widget => '/Widgets/Form/Boolean', - WidgetArguments => { - Description => 'Use SSL?', # loc - }, - }, rtname => { Widget => '/Widgets/Form/String', WidgetArguments => { @@ -288,7 +282,9 @@ sub SaveConfig { # remove obsolete settings we'll add later $content =~ s/^\s* Set \s* \( \s* \$$_ .*$//xm; - $content .= "Set( \$$_, '$RT::Installer->{InstallConfig}{$_}' );\n"; + my $value = $RT::Installer->{InstallConfig}{$_}; + $value =~ s/(['\\])/\\$1/g; + $content .= "Set( \$$_, '$value' );\n"; } $content .= "1;\n"; print $fh $content; |