From 5ba95dddc96f3d284fb6ea1aaa2d23dec208bc0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 7 Feb 2013 14:19:08 +0100 Subject: [PATCH] // AdminRequestSql::returnBytes is useless --- .../admin/AdminRequestSqlController.php | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index c32edce22..9eb97ce4a 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -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 *