diff --git a/mailpoet/lib/Config/Env.php b/mailpoet/lib/Config/Env.php index 15b8bb5585..b31b5920dc 100644 --- a/mailpoet/lib/Config/Env.php +++ b/mailpoet/lib/Config/Env.php @@ -74,7 +74,7 @@ class Env { if ($parsedHost === false) { throw new \InvalidArgumentException('Invalid db host configuration.'); } - list($host, $port, $socket, $isIpv6) = $parsedHost; + [$host, $port, $socket, $isIpv6] = $parsedHost; global $wpdb; self::$dbPrefix = $wpdb->prefix . self::$pluginPrefix; @@ -93,6 +93,7 @@ class Env { public static function getDbTimezoneOffset($offset = false) { $offset = ($offset) ? $offset : WPFunctions::get()->getOption('gmt_offset'); + $offset = (float)($offset); $mins = $offset * 60; $sgn = ($mins < 0 ? -1 : 1); $mins = abs($mins); diff --git a/mailpoet/tests/integration/Config/EnvTest.php b/mailpoet/tests/integration/Config/EnvTest.php index fb789dcf93..e573b4042f 100644 --- a/mailpoet/tests/integration/Config/EnvTest.php +++ b/mailpoet/tests/integration/Config/EnvTest.php @@ -86,6 +86,7 @@ class EnvTest extends \MailPoetTest { verify(Env::getDbTimezoneOffset('+1.5'))->equals("+01:30"); verify(Env::getDbTimezoneOffset('+11'))->equals("+11:00"); verify(Env::getDbTimezoneOffset('-5.5'))->equals("-05:30"); + verify(Env::getDbTimezoneOffset('xyz'))->equals("+00:00"); } public function _after() {