summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-05-12 16:52:24 +0200
committerFlorian Pritz <bluewind@xinu.at>2012-05-12 16:52:24 +0200
commitacbe0e4cd2c3b839a5f6f499eea059977976cdba (patch)
treec1cc75983def8b6980a7aea75b7bc998abcc605e
parent82f6b5feb8f698b94cab52bcadefa6130d7f47f7 (diff)
fix missing object initialization and properly declare class variables
var is deprecated since ages and in strict mode we have to initialize $this->var as a generic object before using it. Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/controllers/file.php6
-rw-r--r--application/controllers/user.php6
-rw-r--r--application/models/file_mod.php2
3 files changed, 11 insertions, 3 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 0848d7470..1ac3a79c9 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -9,13 +9,15 @@
class File extends CI_Controller {
- var $data = array();
- var $var;
+ public $data = array();
+ public $var;
function __construct()
{
parent::__construct();
+ $this->var = new StdClass();
+
$this->load->library('migration');
if ( ! $this->migration->current()) {
show_error($this->migration->error_string());
diff --git a/application/controllers/user.php b/application/controllers/user.php
index 204612b2d..af908a63d 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -2,9 +2,15 @@
class User extends CI_Controller {
+ public $data = array();
+ public $var;
+
function __construct()
{
parent::__construct();
+
+ $this->var = new StdClass();
+
$this->load->library('migration');
if ( ! $this->migration->current()) {
show_error($this->migration->error_string());
diff --git a/application/models/file_mod.php b/application/models/file_mod.php
index ab273cf58..d977d1e70 100644
--- a/application/models/file_mod.php
+++ b/application/models/file_mod.php
@@ -9,7 +9,7 @@
class File_mod extends CI_Model {
- var $data;
+ public $data;
function __construct()
{