Skip to content

Commit c759aa0

Browse files
author
Till Brehm
committed
Merge branch 'aps_error' into 'master'
APS installer installation_success See merge request ispconfig/ispconfig3!669
2 parents aabef8c + d1cf872 commit c759aa0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

server/lib/classes/aps_installer.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ private function doInstallation($task, $sxe)
559559
$shell_ret_str = implode("\n", $shell_ret);
560560

561561
// Although $shell_retcode might be 0, there can be PHP errors. Filter them:
562-
if(substr_count($shell_ret_str, 'Warning: ') > 0) $shell_retcode = 1;
562+
if(stripos($shell_ret_str,'error: ')!==false)$shell_retcode=1;
563563

564564
// If an error has occurred, the return code is != 0
565565
if($shell_retcode != 0) throw new Exception($shell_ret_str);

0 commit comments

Comments
 (0)