2 files changed, 10 insertions, 12 deletions
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