ISPConfig3 devel
parent: c53695f5 | patch | commit | ignore whitespace
tbrehm
2011-12-15 8008bb6b6e7663bdbabbea9da07485ac4daebf25 
Fixed: FS#1932 - Windows newline characters inserted into /var/www/conf/webX/php.ini
1 files modified
2 ■■■■■ changed files
server/plugins-available/apache2_plugin.inc.php 2 ●●●●● patch | view | raw | blame | history 
 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;