summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xssn.at>2011-01-12 15:52:27 +0100
committerFlorian Pritz <bluewind@xssn.at>2011-01-12 15:52:27 +0100
commit08dc976431b632e89a72cdf8edc4d7aee6479988 (patch)
treeb8b678340e6966b5ca5545cf30468c758b69d455
parent96a7df28686b19a424c0c300ab7d5bcbb8829f7c (diff)
delete_id(): don't get the password as a argument
Signed-off-by: Florian Pritz <bluewind@xssn.at>
-rw-r--r--system/application/controllers/file.php2
-rw-r--r--system/application/models/file_mod.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/application/controllers/file.php b/system/application/controllers/file.php
index 1d32bd07a..adde14927 100644
--- a/system/application/controllers/file.php
+++ b/system/application/controllers/file.php
@@ -92,7 +92,7 @@ class File extends Controller {
$data["title"] = "Delete";
$data["id"] = $id;
if ($password != "NULL") {
- if ($this->file_mod->delete_id($id, $password)) {
+ if ($this->file_mod->delete_id($id)) {
if ($this->var->cli_client) {
echo $id." deleted\n";
die();
diff --git a/system/application/models/file_mod.php b/system/application/models/file_mod.php
index 19a607334..30b170e3e 100644
--- a/system/application/models/file_mod.php
+++ b/system/application/models/file_mod.php
@@ -297,7 +297,7 @@ class File_mod extends Model {
}
}
- function delete_id($id, $password)
+ function delete_id($id)
{
$filedata = $this->get_filedata($id);
$password = $this->get_password();