Skip to content

Commit d6ce1e9

Browse files
jamierumbelowjamierumbelow
committed
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Conflicts: system/core/Loader.php system/database/DB_query_builder.php system/database/drivers/cubrid/cubrid_driver.php system/database/drivers/mssql/mssql_driver.php system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/database/drivers/oci8/oci8_driver.php system/database/drivers/odbc/odbc_driver.php system/database/drivers/pdo/pdo_driver.php system/database/drivers/postgre/postgre_driver.php system/database/drivers/sqlite/sqlite_driver.php user_guide_src/source/changelog.rst user_guide_src/source/database/query_builder.rst
2 parents bcee50f + 9e2d5d1 commit d6ce1e9

File tree

231 files changed

+10538
-7887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+10538
-7887
lines changed

‎.travis.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
language: php
2+
3+
php:
4+
- 5.3
5+
- 5.4
6+
7+
env:
8+
- DB=mysql
9+
- DB=pgsql
10+
- DB=sqlite
11+
12+
before_script:
13+
- pyrus channel-discover pear.php-tools.net
14+
- pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz
15+
- phpenv rehash
16+
- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi"
17+
- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi"
18+
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"
19+
20+
script: phpunit --configuration tests/travis/$DB.phpunit.xml
21+
22+
branches:
23+
only:
24+
- develop
25+
- master

‎application/config/autoload.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/**
33
* CodeIgniter
44
*
5-
* An open source application development framework for PHP 5.1.6 or newer
5+
* An open source application development framework for PHP 5.2.4 or newer
66
*
77
* NOTICE OF LICENSE
8-
*
8+
*
99
* Licensed under the Academic Free License version 3.0
10-
*
10+
*
1111
* This source file is subject to the Academic Free License (AFL 3.0) that is
1212
* bundled with this package in the files license_afl.txt / license_afl.rst.
1313
* It is also available through the world wide web at this URL:

‎application/config/config.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/**
33
* CodeIgniter
44
*
5-
* An open source application development framework for PHP 5.1.6 or newer
5+
* An open source application development framework for PHP 5.2.4 or newer
66
*
77
* NOTICE OF LICENSE
8-
*
8+
*
99
* Licensed under the Academic Free License version 3.0
10-
*
10+
*
1111
* This source file is subject to the Academic Free License (AFL 3.0) that is
1212
* bundled with this package in the files license_afl.txt / license_afl.rst.
1313
* It is also available through the world wide web at this URL:
@@ -297,12 +297,14 @@
297297
| 'cookie_domain' = Set to .your-domain.com for site-wide cookies
298298
| 'cookie_path' = Typically will be a forward slash
299299
| 'cookie_secure' = Cookies will only be set if a secure HTTPS connection exists.
300+
| 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript)
300301
|
301302
*/
302303
$config['cookie_prefix'] = "";
303304
$config['cookie_domain'] = "";
304305
$config['cookie_path'] = "/";
305306
$config['cookie_secure'] = FALSE;
307+
$config['cookie_httponly'] = FALSE;
306308

307309
/*
308310
|--------------------------------------------------------------------------

‎application/config/constants.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/**
33
* CodeIgniter
44
*
5-
* An open source application development framework for PHP 5.1.6 or newer
5+
* An open source application development framework for PHP 5.2.4 or newer
66
*
77
* NOTICE OF LICENSE
8-
*
8+
*
99
* Licensed under the Academic Free License version 3.0
10-
*
10+
*
1111
* This source file is subject to the Academic Free License (AFL 3.0) that is
1212
* bundled with this package in the files license_afl.txt / license_afl.rst.
1313
* It is also available through the world wide web at this URL:
@@ -66,8 +66,8 @@
6666
| Display Debug backtrace
6767
|--------------------------------------------------------------------------
6868
|
69-
| If set to TRUE, a backtrace will be displayed along with php errors. If
70-
| error_reporting is disabled, the backtrace will not display, regardless
69+
| If set to TRUE, a backtrace will be displayed along with php errors. If
70+
| error_reporting is disabled, the backtrace will not display, regardless
7171
| of this setting
7272
|
7373
*/

‎application/config/database.php‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/**
33
* CodeIgniter
44
*
5-
* An open source application development framework for PHP 5.1.6 or newer
5+
* An open source application development framework for PHP 5.2.4 or newer
66
*
77
* NOTICE OF LICENSE
8-
*
8+
*
99
* Licensed under the Academic Free License version 3.0
10-
*
10+
*
1111
* This source file is subject to the Academic Free License (AFL 3.0) that is
1212
* bundled with this package in the files license_afl.txt / license_afl.rst.
1313
* It is also available through the world wide web at this URL:
@@ -43,7 +43,8 @@
4343
| ['password'] The password used to connect to the database
4444
| ['database'] The name of the database you want to connect to
4545
| ['dbdriver'] The database type. e.g.: mysql. Currently supported:
46-
mysql, mysqli, pdo, postgre, odbc, mssql, sqlite, oci8
46+
| cubrid, interbase, mssql, mysql, mysqli, oci8,
47+
| odbc, pdo, postgre, sqlite, sqlite3, sqlsrv
4748
| ['dbprefix'] You can add an optional prefix, which will be added
4849
| to the table name when using the Query Builder class
4950
| ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
@@ -75,23 +76,25 @@
7576
$active_group = 'default';
7677
$query_builder = TRUE;
7778

78-
$db['default']['dsn'] = '';
79-
$db['default']['hostname'] = 'localhost';
80-
$db['default']['username'] = '';
81-
$db['default']['password'] = '';
82-
$db['default']['database'] = '';
83-
$db['default']['dbdriver'] = 'mysql';
84-
$db['default']['dbprefix'] = '';
85-
$db['default']['pconnect'] = FALSE;
86-
$db['default']['db_debug'] = TRUE;
87-
$db['default']['cache_on'] = FALSE;
88-
$db['default']['cachedir'] = '';
89-
$db['default']['char_set'] = 'utf8';
90-
$db['default']['dbcollat'] = 'utf8_general_ci';
91-
$db['default']['swap_pre'] = '';
92-
$db['default']['autoinit'] = TRUE;
93-
$db['default']['stricton'] = FALSE;
94-
$db['default']['failover'] = array();
79+
$db['default'] = array(
80+
'dsn' => '',
81+
'hostname' => 'localhost',
82+
'username' => '',
83+
'password' => '',
84+
'database' => '',
85+
'dbdriver' => 'mysqli',
86+
'dbprefix' => '',
87+
'pconnect' => FALSE,
88+
'db_debug' => TRUE,
89+
'cache_on' => FALSE,
90+
'cachedir' => '',
91+
'char_set' => 'utf8',
92+
'dbcollat' => 'utf8_general_ci',
93+
'swap_pre' => '',
94+
'autoinit' => TRUE,
95+
'stricton' => FALSE,
96+
'failover' => array()
97+
);
9598

9699
/* End of file database.php */
97100
/* Location: ./application/config/database.php */

‎application/config/doctypes.php‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/**
33
* CodeIgniter
44
*
5-
* An open source application development framework for PHP 5.1.6 or newer
5+
* An open source application development framework for PHP 5.2.4 or newer
66
*
77
* NOTICE OF LICENSE
8-
*
8+
*
99
* Licensed under the Academic Free License version 3.0
10-
*
10+
*
1111
* This source file is subject to the Academic Free License (AFL 3.0) that is
1212
* bundled with this package in the files license_afl.txt / license_afl.rst.
1313
* It is also available through the world wide web at this URL:
@@ -26,15 +26,25 @@
2626
*/
2727

2828
$_doctypes = array(
29-
'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
30-
'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
31-
'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
32-
'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
33-
'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
34-
'html5' => '<!DOCTYPE html>',
35-
'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
36-
'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
37-
'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
29+
'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
30+
'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
31+
'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
32+
'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
33+
'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
34+
'html5' => '<!DOCTYPE html>',
35+
'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
36+
'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
37+
'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
38+
'mathml1' => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
39+
'mathml2' => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
40+
'svg10' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
41+
'svg11' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
42+
'svg11-basic' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
43+
'svg11-tiny' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
44+
'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
45+
'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
46+
'xhtml-rdfa-1' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
47+
'xhtml-rdfa-2' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">'
3848
);
3949

4050
/* End of file doctypes.php */

‎application/config/foreign_chars.php‎

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/**
33
* CodeIgniter
44
*
5-
* An open source application development framework for PHP 5.1.6 or newer
5+
* An open source application development framework for PHP 5.2.4 or newer
66
*
77
* NOTICE OF LICENSE
8-
*
8+
*
99
* Licensed under the Academic Free License version 3.0
10-
*
10+
*
1111
* This source file is subject to the Academic Free License (AFL 3.0) that is
1212
* bundled with this package in the files license_afl.txt / license_afl.rst.
1313
* It is also available through the world wide web at this URL:
@@ -40,50 +40,55 @@
4040
'/Ä/' => 'Ae',
4141
'/Ü/' => 'Ue',
4242
'/Ö/' => 'Oe',
43-
'/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ/' => 'A',
44-
'/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª/' => 'a',
43+
'/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ|Α|Ά/' => 'A',
44+
'/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª|α|ά/' => 'a',
4545
'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
4646
'/ç|ć|ĉ|ċ|č/' => 'c',
47-
'/Ð|Ď|Đ/' => 'Dj',
48-
'/ð|ď|đ/' => 'dj',
49-
'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě/' => 'E',
50-
'/è|é|ê|ë|ē|ĕ|ė|ę|ě/' => 'e',
51-
'/Ĝ|Ğ|Ġ|Ģ/' => 'G',
52-
'/ĝ|ğ|ġ|ģ/' => 'g',
47+
'/Ð|Ď|Đ|Δ/' => 'Dj',
48+
'/ð|ď|đ|δ/' => 'dj',
49+
'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ/' => 'E',
50+
'/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε/' => 'e',
51+
'/Ĝ|Ğ|Ġ|Ģ|Γ/' => 'G',
52+
'/ĝ|ğ|ġ|ģ|γ/' => 'g',
5353
'/Ĥ|Ħ/' => 'H',
5454
'/ĥ|ħ/' => 'h',
55-
'/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ/' => 'I',
56-
'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı/' => 'i',
55+
'/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ|Η|Ή|Ί|Ι|Ϊ/' => 'I',
56+
'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ/' => 'i',
5757
'/Ĵ/' => 'J',
5858
'/ĵ/' => 'j',
59-
'/Ķ/' => 'K',
60-
'/ķ/' => 'k',
61-
'/Ĺ|Ļ|Ľ|Ŀ|Ł/' => 'L',
62-
'/ĺ|ļ|ľ|ŀ|ł/' => 'l',
63-
'/Ñ|Ń|Ņ|Ň/' => 'N',
64-
'/ñ|ń|ņ|ň|ʼn/' => 'n',
65-
'/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ/' => 'O',
66-
'/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º/' => 'o',
67-
'/Ŕ|Ŗ|Ř/' => 'R',
68-
'/ŕ|ŗ|ř/' => 'r',
69-
'/Ś|Ŝ|Ş|Š/' => 'S',
70-
'/ś|ŝ|ş|š|ſ/' => 's',
71-
'/Ţ|Ť|Ŧ/' => 'T',
72-
'/ţ|ť|ŧ/' => 't',
59+
'/Ķ|Κ/' => 'K',
60+
'/ķ|κ/' => 'k',
61+
'/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ/' => 'L',
62+
'/ĺ|ļ|ľ|ŀ|ł|λ/' => 'l',
63+
'/Ñ|Ń|Ņ|Ň|Ν/' => 'N',
64+
'/ñ|ń|ņ|ň|ʼn|ν/' => 'n',
65+
'/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ|Ο|Ό|Ω|Ώ/' => 'O',
66+
'/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º|ο|ό|ω|ώ/' => 'o',
67+
'/Ŕ|Ŗ|Ř|Ρ/' => 'R',
68+
'/ŕ|ŗ|ř|ρ/' => 'r',
69+
'/Ś|Ŝ|Ş|Ș|Š|Σ/' => 'S',
70+
'/ś|ŝ|ş|ș|š|ſ|σ|ς/' => 's',
71+
'/Ț|Ţ|Ť|Ŧ|τ/' => 'T',
72+
'/ț|ţ|ť|ŧ/' => 't',
7373
'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ/' => 'U',
74-
'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ/' => 'u',
75-
'/Ý|Ÿ|Ŷ/' => 'Y',
74+
'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ/' => 'u',
75+
'/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ/' => 'Y',
7676
'/ý|ÿ|ŷ/' => 'y',
7777
'/Ŵ/' => 'W',
7878
'/ŵ/' => 'w',
79-
'/Ź|Ż|Ž/' => 'Z',
80-
'/ź|ż|ž/' => 'z',
79+
'/Ź|Ż|Ž|Ζ/' => 'Z',
80+
'/ź|ż|ž|ζ/' => 'z',
8181
'/Æ|Ǽ/' => 'AE',
8282
'/ß/'=> 'ss',
8383
'/IJ/' => 'IJ',
8484
'/ij/' => 'ij',
8585
'/Œ/' => 'OE',
86-
'/ƒ/' => 'f'
86+
'/ƒ/' => 'f',
87+
'/ξ/' => 'ks',
88+
'/π/' => 'p',
89+
'/β/' => 'v',
90+
'/μ/' => 'm',
91+
'/ψ/' => 'ps',
8792
);
8893

8994
/* End of file foreign_chars.php */

‎application/config/hooks.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/**
33
* CodeIgniter
44
*
5-
* An open source application development framework for PHP 5.1.6 or newer
5+
* An open source application development framework for PHP 5.2.4 or newer
66
*
77
* NOTICE OF LICENSE
8-
*
8+
*
99
* Licensed under the Academic Free License version 3.0
10-
*
10+
*
1111
* This source file is subject to the Academic Free License (AFL 3.0) that is
1212
* bundled with this package in the files license_afl.txt / license_afl.rst.
1313
* It is also available through the world wide web at this URL:
@@ -37,6 +37,5 @@
3737
*/
3838

3939

40-
4140
/* End of file hooks.php */
4241
/* Location: ./application/config/hooks.php */

‎application/config/memcached.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* CodeIgniter
44
*
5-
* An open source application development framework for PHP 5.1.6 or newer
5+
* An open source application development framework for PHP 5.2.4 or newer
66
*
77
* NOTICE OF LICENSE
88
*

‎application/config/migration.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/**
33
* CodeIgniter
44
*
5-
* An open source application development framework for PHP 5.1.6 or newer
5+
* An open source application development framework for PHP 5.2.4 or newer
66
*
77
* NOTICE OF LICENSE
88
*
@@ -89,5 +89,5 @@
8989
*/
9090
$config['migration_path'] = APPPATH . 'migrations/';
9191

92-
93-
/* End of file migration.php */
92+
/* End of file migration.php */
93+
/* Location: ./application/config/migration.php */

0 commit comments

Comments
 (0)