diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 10de1d8fbf585ca698a782dc834e02c035a6444f..5a0b0ceaf51d8e3666308c89549aa4c249d2717f 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -547,16 +547,15 @@ function remove_blank_lines($input, $file = 1){ $content = $input; } $lines = explode("\n", $content); + $new_lines = array(); if(!empty($lines)){ foreach($lines as $line){ if(trim($line) != '') $new_lines[] = $line; } } - if(is_array($new_lines)){ - $content = implode("\n", $new_lines); - } else { - $content = ''; - } + + $content = implode("\n", $new_lines); + if($file){ wf($input, $content); }else{ diff --git a/server/lib/classes/file.inc.php b/server/lib/classes/file.inc.php index 28757d0dd50b4e30baab69e29cf14d22dfb4e577..0cfdf6f2eddcb62489b2c7af490679e261b93b65 100644 --- a/server/lib/classes/file.inc.php +++ b/server/lib/classes/file.inc.php @@ -118,16 +118,15 @@ class file{ $content = $input; } $lines = explode("\n", $content); + $new_lines = array(); if(!empty($lines)){ foreach($lines as $line){ if(trim($line) != '') $new_lines[] = $line; } } - if(is_array($new_lines)){ - $content = implode("\n", $new_lines); - } else { - $content = ''; - } + + $content = implode("\n", $new_lines); + if($file){ $this->wf($input, $content); } else {