diff options
| author | Anton Lindqvist <anton@qvister.se> | 2012-04-25 12:08:37 +0200 |
|---|---|---|
| committer | Anton Lindqvist <anton@qvister.se> | 2012-04-25 12:08:37 +0200 |
| commit | 92f10e837d132f9866626d3f2e0a633b22329ebb (patch) | |
| tree | e3ade8c7dd46f90690455fb2dcc112d6d015c980 /application/config/constants.php | |
| parent | 210e664abe857ddd267a7ba8713e2318d3e59a9c (diff) | |
| parent | f8ae11598ba058ee02cc4f8c82dbab3420756aae (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/libraries/Cache/Cache.php
Diffstat (limited to 'application/config/constants.php')
| -rw-r--r-- | application/config/constants.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/application/config/constants.php b/application/config/constants.php index c7203e47d..d22d2963e 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -1,13 +1,13 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Academic Free License version 3.0 - * + * * This source file is subject to the Academic Free License (AFL 3.0) that is * bundled with this package in the files license_afl.txt / license_afl.rst. * It is also available through the world wide web at this URL: @@ -66,8 +66,8 @@ define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b'); | Display Debug backtrace |-------------------------------------------------------------------------- | -| If set to TRUE, a backtrace will be displayed along with php errors. If -| error_reporting is disabled, the backtrace will not display, regardless +| If set to TRUE, a backtrace will be displayed along with php errors. If +| error_reporting is disabled, the backtrace will not display, regardless | of this setting | */ |