From a11bf295078656612603c1c561e9261555d0c40c Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sat, 9 Jan 2010 23:57:16 -0800 Subject: Fix for ticket #972 and more. In Kohana 2.4, ORM::delete_all ignores any where clauses and deletes all the entries in the table unless an array of id's are passed as the parameter. This fix used the Database_builder to specify any where conditions. Thanks psvo for find the first one. :-) --- modules/server_add/controllers/server_add.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/server_add/controllers/server_add.php') diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php index f6e3a4dd..d7572b52 100644 --- a/modules/server_add/controllers/server_add.php +++ b/modules/server_add/controllers/server_add.php @@ -266,7 +266,10 @@ class Server_Add_Controller extends Admin_Controller { $task->done = true; $task->state = "success"; $task->percent_complete = 100; - ORM::factory("server_add_file")->where("task_id", "=", $task->id)->delete_all(); + db::build() + ->delete("server_add_files") + ->where("task_id", "=", $task->id) + ->execute(); message::info(t2("Successfully added one photo / album", "Successfully added %count photos / albums", $task->get("completed_files"))); -- cgit v1.2.3