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

// AdminRequestSql::returnBytes is useless

Browse Source
This commit is contained in:
Rémi Gaillard
2013-02-07 14:19:08 +01:00
parent 97481cbe84
commit 5ba95dddc9
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
controllers/admin/AdminRequestSqlController.php
View File

@@ -323,7 +323,7 @@ class AdminRequestSqlControllerCore extends AdminController
if (file_exists(_PS_ADMIN_DIR_.'/export/'.$file))
{
$filesize = filesize(_PS_ADMIN_DIR_.'/export/'.$file);
$upload_max_filesize = $this->returnBytes(ini_get('upload_max_filesize'));
$upload_max_filesize = Tools::convertBytes(ini_get('upload_max_filesize'));
if ($filesize < $upload_max_filesize)
{
if (Configuration::get('PS_ENCODING_FILE_MANAGER_SQL'))
@@ -345,28 +345,6 @@ class AdminRequestSqlControllerCore extends AdminController
}
}
/**
* Get number of bytes
*
* @param $val
* @return int|string
*/
public function returnBytes($val)
{
$val = trim($val);
$last = strtolower($val[strlen($val) - 1]);
switch ($last)
{
case 'g':
$val *= 1024;
case 'm':
$val *= 1024;
case 'k':
$val *= 1024;
}
return $val;
}
/**
* Display all errors
*