move user::delete() to User_Model::delete()

4 files changed, 12 insertions, 17 deletions

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) { }
   }
 
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index dac39980..8dfbb21a 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -87,16 +87,6 @@ class user_Core {
   }
 
   /**
-   * Delete a user
-   *
-   * @param string $id the user id
-   */
-  static function delete($id) {
-    ORM::factory("user", $id)->delete();
-    module::event("user_deleted", $user);
-  }
-
-  /**
    * Is the password provided correct?
    *
    * @param user User Model
@@ -148,7 +138,7 @@ class user_Core {
     $user->last_login = time();
     $user->save();
 
-    Session::instance()->set('user', $user);
+    Session::instance()->set("user", $user);
     module::event("user_login", $user);
   }
 
@@ -158,7 +148,7 @@ class user_Core {
    * @param string $salt (optional) salt or hash containing salt (randomly generated if omitted)
    * @return string hashed password
    */
-  private static function _md5Salt($password, $salt='') {
+  private static function _md5Salt($password, $salt="") {
     if (empty($salt)) {
       for ($i = 0; $i < 4; $i++) {
         $char = mt_rand(48, 109);
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 775d753f..bb01fd49 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -34,4 +34,12 @@ class User_Model extends ORM {
     }
     parent::__set($column, $value);
   }
+
+  /**
+   * @see ORM::delete()
+   */
+  public function delete($id=null) {
+    parent::delete($id);
+    module::event("user_deleted", $user);
+  }
 }
\ No newline at end of file