Commit 03edb768 authored by haystack's avatar haystack 🤔

resolve conflict for PHP 7.2 fix

parent fd6ba3ea
...@@ -1144,7 +1144,7 @@ if ( ! defined( 'CIVICRM_WPCLI_LOADED' ) ) { ...@@ -1144,7 +1144,7 @@ if ( ! defined( 'CIVICRM_WPCLI_LOADED' ) ) {
$parsed['dbsyntax'] = $str; $parsed['dbsyntax'] = $str;
} }
if ( ! count( $dsn ) ) { if ( empty( $dsn ) ) {
return $parsed; return $parsed;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment