Fixed Undefined variable $new_lines in /usr/local/ispconfig/server/lib/classes/file.inc.php on line 126

Till Brehm · Till Brehm · commit 79637839cb40 · 2023-01-20T10:13:31.000Z
diff --git a/server/lib/classes/file.inc.php b/server/lib/classes/file.inc.php
@@ -118,12 +118,13 @@ 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)){
+		if(!empty($new_lines)){
 			$content = implode("\n", $new_lines);
 		} else {
 			$content = '';

Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,13 @@ function remove_blank_lines($input, $file = 1){`
`118`	`118`	`$content = $input;`
`119`	`119`	`}`
`120`	`120`	`$lines = explode("\n", $content);`
	`121`	`+ $new_lines = array();`
`121`	`122`	`if(!empty($lines)){`
`122`	`123`	`foreach($lines as $line){`
`123`	`124`	`if(trim($line) != '') $new_lines[] = $line;`
`124`	`125`	`}`
`125`	`126`	`}`
`126`		`- if(is_array($new_lines)){`
	`127`	`+ if(!empty($new_lines)){`
`127`	`128`	`$content = implode("\n", $new_lines);`
`128`	`129`	`} else {`
`129`	`130`	`$content = '';`