Skip to content

Commit efb5a55

Browse files
author
Till Brehm
committed
Merge branch '6463-new-lines' into 'develop'
Initialize new_lines array, #6463 Closes #6463 See merge request ispconfig/ispconfig3!1694
2 parents d340266 + 344b6bc commit efb5a55

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

install/lib/install.lib.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -547,16 +547,15 @@ function remove_blank_lines($input, $file = 1){
547547
$content = $input;
548548
}
549549
$lines = explode("\n", $content);
550+
$new_lines = array();
550551
if(!empty($lines)){
551552
foreach($lines as $line){
552553
if(trim($line) != '') $new_lines[] = $line;
553554
}
554555
}
555-
if(is_array($new_lines)){
556-
$content = implode("\n", $new_lines);
557-
} else {
558-
$content = '';
559-
}
556+
557+
$content = implode("\n", $new_lines);
558+
560559
if($file){
561560
wf($input, $content);
562561
}else{

server/lib/classes/file.inc.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,15 @@ function remove_blank_lines($input, $file = 1){
118118
$content = $input;
119119
}
120120
$lines = explode("\n", $content);
121+
$new_lines = array();
121122
if(!empty($lines)){
122123
foreach($lines as $line){
123124
if(trim($line) != '') $new_lines[] = $line;
124125
}
125126
}
126-
if(is_array($new_lines)){
127-
$content = implode("\n", $new_lines);
128-
} else {
129-
$content = '';
130-
}
127+
128+
$content = implode("\n", $new_lines);
129+
131130
if($file){
132131
$this->wf($input, $content);
133132
} else {

0 commit comments

Comments
 (0)