From 45dc72c54b858a565e5b1a434594f3acc15843bc Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 22 Feb 2015 11:19:11 +0100 Subject: s\files: rename add_file to add_uploaded_file It doesn't add any file so it should have that name. Signed-off-by: Florian Pritz --- application/controllers/api/v1/file.php | 2 +- application/controllers/file.php | 2 +- application/service/files.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'application') diff --git a/application/controllers/api/v1/file.php b/application/controllers/api/v1/file.php index a10aaf63a..266b1aff8 100644 --- a/application/controllers/api/v1/file.php +++ b/application/controllers/api/v1/file.php @@ -34,7 +34,7 @@ class file extends \controllers\api\api_controller { foreach ($files as $file) { $id = $this->mfile->new_id($limits[0], $limits[1]); - \service\files::add_file($id, $file["tmp_name"], $file["name"]); + \service\files::add_uploaded_file($id, $file["tmp_name"], $file["name"]); $ids[] = $id; $urls[] = site_url($id).'/'; } diff --git a/application/controllers/file.php b/application/controllers/file.php index 6a14fceee..ff112e3d4 100644 --- a/application/controllers/file.php +++ b/application/controllers/file.php @@ -808,7 +808,7 @@ class File extends MY_Controller { $filename = trim($filename, "\r\n\0\t\x0B"); - service\files::add_file($id, $file["tmp_name"], $filename); + service\files::add_uploaded_file($id, $file["tmp_name"], $filename); $ids[] = $id; } diff --git a/application/service/files.php b/application/service/files.php index ed0d3ec7e..e12e636be 100644 --- a/application/service/files.php +++ b/application/service/files.php @@ -81,7 +81,7 @@ class files { )); } - static public function add_file($id, $file, $filename) + static public function add_uploaded_file($id, $file, $filename) { self::add_file_callback($id, $filename, array( "hash" => function() use ($file) { -- cgit v1.2.3-24-g4f1b