MAJ en Thelia 2.3.4

This commit is contained in:
2020-05-03 08:14:07 +02:00
parent 72ddf49e60
commit 35a800ca0e
328 changed files with 9560 additions and 14163 deletions

View File

@@ -55,8 +55,10 @@ class CheckPermission extends BaseInstall
'fileinfo',
'gd',
'intl',
'mcrypt',
'openssl',
'pdo_mysql',
'dom',
'calendar'
);
protected $validationMessages = array();
@@ -356,13 +358,13 @@ class CheckPermission extends BaseInstall
switch ($last) {
// The 'G' modifier is available since PHP 5.1.0
case 'g':
$val *= 1024;
$val = (int)$val*1024;
// no break
case 'm':
$val *= 1024;
$val = (int)$val*1024;
// no break
case 'k':
$val *= 1024;
$val = (int)$val*1024;
}
return $val;

View File

@@ -596,7 +596,13 @@ class Update
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($curl, CURLOPT_TIMEOUT, 5);
$res = curl_exec($curl);
if (Version::parse($res))
return $res;
try {
if (Version::parse($res)) {
return trim($res);
}
} catch (\Exception $e) {
return null;
}
}
}