Merge branch 'master' of disposed.de:scattport

2011-04-22 02:54:50 +02:00
parent 55f4fc9b66 2ee4d42d7c
commit 8a977e9f33
4 changed files with 89 additions and 4 deletions
--- a/application/models/user.php
+++ b/application/models/user.php
@@ -274,7 +274,6 @@ class User extends CI_Model {

                $session_data = array(
                    'username' => $result->username,
-                    'id' => $result->id, // kept for backwards compatibility
 					'user_id' => $result->id,
 					'group_id' => $result->group_id,
 					'group' => $group->name