From f69f3967ea816c6231fdf8689182b8a8dfe715c8 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 9 Dec 2008 00:07:26 +0000 Subject: move user::delete() to User_Model::delete() --- core/controllers/welcome.php | 2 +- core/tests/Access_Helper_Test.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'core') diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php index ce036a5f..ce9d3219 100644 --- a/core/controllers/welcome.php +++ b/core/controllers/welcome.php @@ -445,7 +445,7 @@ class Welcome_Controller extends Template_Controller { } public function delete_user($id) { - user::delete($id); + ORM::factory("user", $id)->delete(); url::redirect("welcome"); } diff --git a/core/tests/Access_Helper_Test.php b/core/tests/Access_Helper_Test.php index 537aa1e8..96a28ada 100644 --- a/core/tests/Access_Helper_Test.php +++ b/core/tests/Access_Helper_Test.php @@ -33,10 +33,7 @@ class Access_Helper_Test extends Unit_Test_Case { } catch (Exception $e) { } try { - $user = ORM::factory("user")->where("name", "access_test")->find(); - if ($user->loaded) { - user::delete($user->id); - } + ORM::factory("user")->where("name", "access_test")->find()->delete(); } catch (Exception $e) { } } -- cgit v1.2.3