summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-02-22 11:19:11 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-02-22 11:19:11 +0100
commit45dc72c54b858a565e5b1a434594f3acc15843bc (patch)
tree7ffbf527bb5784644cb2657d0eed26f2d03e6bc5
parentc6208bd2271fa02662c4b106c61ca712b46499e5 (diff)
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 <bluewind@xinu.at>
-rw-r--r--application/controllers/api/v1/file.php2
-rw-r--r--application/controllers/file.php2
-rw-r--r--application/service/files.php2
3 files changed, 3 insertions, 3 deletions
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) {