From f69f3967ea816c6231fdf8689182b8a8dfe715c8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Dec 2008 00:07:26 +0000
Subject: move user::delete() to User_Model::delete()

---
 modules/user/helpers/user.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'modules/user/helpers')

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
@@ -86,16 +86,6 @@ class user_Core {
     return $user;
   }
 
-  /**
-   * 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?
    *
@@ -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);
-- 
cgit v1.2.3