diff options
| author | Jonathon Hill <jhill@brandmovers.com> | 2012-11-12 14:51:41 +0100 |
|---|---|---|
| committer | Jonathon Hill <jhill@brandmovers.com> | 2012-11-12 14:51:41 +0100 |
| commit | 3978fc33d82dd7f778d1adbf30744f4dfac41c25 (patch) | |
| tree | f32be1ae610f0cfeff65c35abecd14e8ea5cadc6 /application/views/errors | |
| parent | 275cf274860c6ed181d50b398efd3a21d7ba9135 (diff) | |
| parent | a9ab46d7a031bda304eb9b6658ffaf693b8d9bcb (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
user_guide_src/source/changelog.rst
Signed-off-by: Jonathon Hill <jhill@brandmovers.com>
Diffstat (limited to 'application/views/errors')
| -rw-r--r-- | application/views/errors/error_404.php | 3 | ||||
| -rw-r--r-- | application/views/errors/error_db.php | 3 | ||||
| -rw-r--r-- | application/views/errors/error_general.php | 3 | ||||
| -rw-r--r-- | application/views/errors/error_php.php | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/application/views/errors/error_404.php b/application/views/errors/error_404.php index fe48fd524..4a8823dee 100644 --- a/application/views/errors/error_404.php +++ b/application/views/errors/error_404.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php /** * CodeIgniter * @@ -24,6 +24,7 @@ * @since Version 1.0 * @filesource */ +defined('BASEPATH') OR exit('No direct script access allowed'); ?><!DOCTYPE html> <html lang="en"> <head> diff --git a/application/views/errors/error_db.php b/application/views/errors/error_db.php index 76ca6df7a..21d5d86ef 100644 --- a/application/views/errors/error_db.php +++ b/application/views/errors/error_db.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php /** * CodeIgniter * @@ -24,6 +24,7 @@ * @since Version 1.0 * @filesource */ +defined('BASEPATH') OR exit('No direct script access allowed'); ?><!DOCTYPE html> <html lang="en"> <head> diff --git a/application/views/errors/error_general.php b/application/views/errors/error_general.php index e9baf1665..5bf361113 100644 --- a/application/views/errors/error_general.php +++ b/application/views/errors/error_general.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php /** * CodeIgniter * @@ -24,6 +24,7 @@ * @since Version 1.0 * @filesource */ +defined('BASEPATH') OR exit('No direct script access allowed'); ?><!DOCTYPE html> <html lang="en"> <head> diff --git a/application/views/errors/error_php.php b/application/views/errors/error_php.php index b76dc8a9e..c0c4bd622 100644 --- a/application/views/errors/error_php.php +++ b/application/views/errors/error_php.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php /** * CodeIgniter * @@ -24,6 +24,7 @@ * @since Version 1.0 * @filesource */ +defined('BASEPATH') OR exit('No direct script access allowed'); ?> <div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;"> |