Skip to content

Commit 851a733

Browse files
authored
Merge branch 'develop-v4' into fix/no-https
2 parents 5c9b4df + 410f96a commit 851a733

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

img-versions.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"easyengine/nginx-proxy": "v4.0.0-rc.2",
66
"easyengine/nginx": "v4.0.0-rc.1",
77
"easyengine/php": "v4.0.0-rc.2",
8-
"easyengine/phpmyadmin": "v4.0.0-rc.1",
9-
"easyengine/postfix": "v4.0.0-rc.1",
8+
"easyengine/postfix": "v4.0.0-rc.2",
109
"easyengine/redis": "v4.0.0-rc.1"
1110
}

php/commands/src/CLI_Command.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public function update( $_, $assoc_args ) {
309309
EE::log( 'Updating EasyEngine to new version. This might take some time.' );
310310

311311
$php_binary = Utils\get_php_binary();
312-
$process = EE\Process::create( "{$php_binary} $temp cli info" );
312+
$process = EE\Process::create( "{$php_binary} $temp cli info", null, null );
313313
$result = $process->run();
314314
if ( 0 !== $result->return_code || false === stripos( $result->stdout, 'EE version' ) ) {
315315
$multi_line = explode( PHP_EOL, $result->stderr );

0 commit comments

Comments
 (0)