From e05bc6caa3eee5d2e19efea641116739dfbc6a5d Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Tue, 10 Dec 2013 20:38:15 +0200
Subject: [PATCH] =?UTF-8?q?K=C3=A4ytt=C3=A4j=C3=A4tiedot=20sis=C3=A4ll?=
 =?UTF-8?q?=C3=A4=C3=A4n=20pit=C3=A4v=C3=A4=20$user=20on=20privaatti,=20jo?=
 =?UTF-8?q?ten=20muutetaan=20muotoon=20$=5Fuser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/welcome.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index 916a55b..d9fa1fe 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -2,7 +2,7 @@
 
 class Welcome extends CI_Controller
 {
-    private $user;
+    private $_user;
     public $card_count;
 
     public function __construct()
@@ -11,7 +11,7 @@ class Welcome extends CI_Controller
         $this->load->model('ecard_model', 'ecard');
         $this->load->model('erkanaauth_model', 'erkana');
 
-        $this->user = $this->erkana->getUser();
+        $this->_user = $this->erkana->getUser();
         $this->card_count = $this->ecard->countStatuses();
     }
 
@@ -22,7 +22,7 @@ class Welcome extends CI_Controller
             'page_title'    => array( 'Etusivu', 'Ystäväkylä eKortti' ),
             'page_classes'  => array( 'frontpage' ),
             'count'         => $this->card_count,
-            'user'          => $this->user
+            'user'          => $this->_user
         );
 
         $this->load->view('_header', $data);
@@ -36,7 +36,7 @@ class Welcome extends CI_Controller
             'page_title'    => array( 'Virhe 404: Sivua ei löydetty', 'Ystäväkylä eKortti' ),
             'page_classes'  => array( 'error404' ),
             'count'         => $this->card_count,
-            'user'          => $this->user
+            'user'          => $this->_user
         );
 
         $this->load->view('_header', $data);
@@ -50,7 +50,7 @@ class Welcome extends CI_Controller
             'page_title'    => array( 'Tietoa', 'Ystäväkylä eKortti' ),
             'page_classes'  => array( 'info' ),
             'count'         => $this->card_count,
-            'user'          => $this->user
+            'user'          => $this->_user
         );
 
         $this->load->view('_header', $data);
@@ -66,7 +66,7 @@ class Welcome extends CI_Controller
             'page_classes'  => array( 'new_card' ),
             'count'         => $this->card_count,
             'images'        => $this->ecard->getCardsTemplates(1),
-            'user'          => $this->user
+            'user'          => $this->_user
         );
 
         $this->load->view('_header', $data);
@@ -79,7 +79,7 @@ class Welcome extends CI_Controller
         $data = array(
             'page_classes'  => array( 'ecards' ),
             'count'         => $this->card_count,
-            'user'          => $this->user
+            'user'          => $this->_user
         );
 
         if (empty($card_id)) {