summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2010-11-10 21:44:26 +0100
committerGreg Aker <greg.aker@ellislab.com>2010-11-10 21:44:26 +0100
commit4abfa686ca53177b7dbbb7e1bac3febbbe27ec0f (patch)
tree1f3d98599c12dec2258a2c90139f5a3cec60ee7e /application
parent5fcfbaba16e72fb870e77d66fce303b96edfc49d (diff)
Blasting the Base4/5 files. Updating Controller.php to inherit bits from the old Base5.
If a constructor is needed in a controller, call parent::__contruct()
Diffstat (limited to 'application')
-rw-r--r--application/controllers/welcome.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index 3c2f7e1cf..79689f012 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -1,10 +1,10 @@
-<?php
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
class Welcome extends CI_Controller {
- function Welcome()
+ function __construct()
{
- parent::CI_Controller();
+ parent::__construct();
}
function index()