From 55f4fc9b667da241f9a1d883b1c5232ef97d4cf1 Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Fri, 22 Apr 2011 02:02:47 +0200
Subject: [PATCH] Fixed a bug when accessing the session userdata

---
 application/controllers/jobs.php | 4 ++--
 application/models/project.php   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/controllers/jobs.php b/application/controllers/jobs.php
index f488e03..ad2f774 100644
--- a/application/controllers/jobs.php
+++ b/application/controllers/jobs.php
@@ -4,7 +4,7 @@ class Jobs extends CI_Controller {
 	
 	public function getOwn() {
 		$query = $this->db->order_by('progress', 'desc')
-			->get_where('jobs', array('started_by' => $this->session->user_data('user_id')));
+			->get_where('jobs', array('started_by' => $this->session->userdata('user_id')));
 		$count = $query->num_rows();
 		$jobs = $query->result_array();
 		
@@ -39,7 +39,7 @@ class Jobs extends CI_Controller {
 	
 	public function listResultsNotSeen() {
 		$query = $this->db->order_by('started_at', 'asc')
-			->get_where('jobs', array('started_by' => $this->session->user_data('user_id'), 'seen' => '0'));
+			->get_where('jobs', array('started_by' => $this->session->userdata('user_id'), 'seen' => '0'));
 		$count = $query->num_rows();
 		$jobs = $query->result_array();
 		
diff --git a/application/models/project.php b/application/models/project.php
index 1c28ea4..d51e3d0 100644
--- a/application/models/project.php
+++ b/application/models/project.php
@@ -14,7 +14,7 @@ class Project extends CI_Model {
 	 * @return array The user's projects.
 	 */
 	public function getOwn() {
-		$query = $this->db->where(array('owner' => $this->session->user_data('user_id')))
+		$query = $this->db->where(array('owner' => $this->session->userdata('user_id')))
 				->order_by('lastaccess', 'desc')
 				->get('projects');
 		$projects = $query->result_array();
@@ -39,7 +39,8 @@ class Project extends CI_Model {
 	 * @return array The shared projects.
 	 */
 	public function getShared() {
-		$this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => $this->session->user_data('user_id')));
+		$this->load->library('session');
+		$this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => $this->session->userdata('user_id')));
 		$this->db->join('projects', 'projects.id = shares.project_id');
 		$query = $this->db->get();