From e589cc1dbb43111f7b7ecf21c99820baa8b7f45c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 15 Dec 2011 10:23:40 -0500
Subject: [PATCH] Fixed: FS#1912 - uncomment and chagne SSL keys pointing in /etc/dovecot.conf
---
server/plugins-available/apache2_plugin.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 1bdd4c3..7849aca 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -637,7 +637,7 @@
if($master_php_ini_path != '' && substr($master_php_ini_path,-7) == 'php.ini' && is_file($master_php_ini_path)) {
$php_ini_content .= file_get_contents($master_php_ini_path)."\n";
}
- $php_ini_content .= trim($data['new']['custom_php_ini']);
+ $php_ini_content .= str_replace("\r",'',trim($data['new']['custom_php_ini']));
file_put_contents($custom_php_ini_dir.'/php.ini',$php_ini_content);
} else {
$has_custom_php_ini = false;
--
Gitblit v1.9.1