diff options
| author | Pascal Kriete <pascal.kriete@ellislab.com> | 2010-11-10 21:49:22 +0100 |
|---|---|---|
| committer | Pascal Kriete <pascal.kriete@ellislab.com> | 2010-11-10 21:49:22 +0100 |
| commit | 17eddc918607bff693d9e557ab83e77aa8ce295d (patch) | |
| tree | 6105712c400cff20e9df9cbc3dd8b3c9100d53c1 /application/controllers | |
| parent | 89ace43fb4fdfb79cb885eaf671780d52fd61e3f (diff) | |
| parent | 3791853fa72c53062fd72b249efc733b311b3a80 (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniterNoPhp4/
Diffstat (limited to 'application/controllers')
| -rw-r--r-- | application/controllers/welcome.php | 6 |
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() |