Ekokumppanit/ystavakylaecard
1
0
Fork 0
mirror of https://github.com/Ekokumppanit/ystavakylaecard.git synced 2026-02-18 13:48:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Käyttäjätiedot sisällään pitävä $user on privaatti, joten muutetaan muotoon $_user

Browse Source
This commit is contained in:
Ismo Vuorinen
2013-12-10 20:38:15 +02:00
parent 58bc3947f5
commit e05bc6caa3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
application/controllers/welcome.php
View File

@@ -2,7 +2,7 @@
class Welcome extends CI_Controller class Welcome extends CI_Controller
{ {
private $user; private $_user;
public $card_count; public $card_count;
public function __construct() public function __construct()
@@ -11,7 +11,7 @@ class Welcome extends CI_Controller
$this->load->model('ecard_model', 'ecard'); $this->load->model('ecard_model', 'ecard');
$this->load->model('erkanaauth_model', 'erkana'); $this->load->model('erkanaauth_model', 'erkana');
$this->user = $this->erkana->getUser(); $this->_user = $this->erkana->getUser();
$this->card_count = $this->ecard->countStatuses(); $this->card_count = $this->ecard->countStatuses();
} }
@@ -22,7 +22,7 @@ class Welcome extends CI_Controller
'page_title' => array( 'Etusivu', 'Ystäväkylä eKortti' ), 'page_title' => array( 'Etusivu', 'Ystäväkylä eKortti' ),
'page_classes' => array( 'frontpage' ), 'page_classes' => array( 'frontpage' ),
'count' => $this->card_count, 'count' => $this->card_count,
'user' => $this->user 'user' => $this->_user
); );
$this->load->view('_header', $data); $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_title' => array( 'Virhe 404: Sivua ei löydetty', 'Ystäväkylä eKortti' ),
'page_classes' => array( 'error404' ), 'page_classes' => array( 'error404' ),
'count' => $this->card_count, 'count' => $this->card_count,
'user' => $this->user 'user' => $this->_user
); );
$this->load->view('_header', $data); $this->load->view('_header', $data);
@@ -50,7 +50,7 @@ class Welcome extends CI_Controller
'page_title' => array( 'Tietoa', 'Ystäväkylä eKortti' ), 'page_title' => array( 'Tietoa', 'Ystäväkylä eKortti' ),
'page_classes' => array( 'info' ), 'page_classes' => array( 'info' ),
'count' => $this->card_count, 'count' => $this->card_count,
'user' => $this->user 'user' => $this->_user
); );
$this->load->view('_header', $data); $this->load->view('_header', $data);
@@ -66,7 +66,7 @@ class Welcome extends CI_Controller
'page_classes' => array( 'new_card' ), 'page_classes' => array( 'new_card' ),
'count' => $this->card_count, 'count' => $this->card_count,
'images' => $this->ecard->getCardsTemplates(1), 'images' => $this->ecard->getCardsTemplates(1),
'user' => $this->user 'user' => $this->_user
); );
$this->load->view('_header', $data); $this->load->view('_header', $data);
@@ -79,7 +79,7 @@ class Welcome extends CI_Controller
$data = array( $data = array(
'page_classes' => array( 'ecards' ), 'page_classes' => array( 'ecards' ),
'count' => $this->card_count, 'count' => $this->card_count,
'user' => $this->user 'user' => $this->_user
); );
if (empty($card_id)) { if (empty($card_id)) {