dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : #PSTEST-22 : Orthographe à revoir dans combinaisons de la fiche produit

Browse Source
This commit is contained in:
lLefevre
2011-12-22 14:16:11 +00:00
parent 8a81cbb960
commit 6df9b55166
4 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+18 -7
View File
@@ -2000,16 +2000,27 @@ FileETag INode MTime Size
{
$memory_limit = @ini_get('memory_limit');
if (preg_match('/[0-9]+k/i', $memory_limit))
return 1024 * (int)$memory_limit;
return self::getOctets($memory_limit);
}
if (preg_match('/[0-9]+m/i', $memory_limit))
return 1024 * 1024 * (int)$memory_limit;
/**
* getOctet allow to gets the value of a configuration option in octet
*
* @since 1.5.0
* @return int the value of a configuration option in octet
*/
public static function getOctets($option)
{
if (preg_match('/[0-9]+k/i', $option))
return 1024 * (int)$option;
if (preg_match('/[0-9]+g/i', $memory_limit))
return 1024 * 1024 * 1024 * (int)$memory_limit;
if (preg_match('/[0-9]+m/i', $option))
return 1024 * 1024 * (int)$option;
return $memory_limit;
if (preg_match('/[0-9]+g/i', $option))
return 1024 * 1024 * 1024 * (int)$option;
return $option;
}
/**