summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2016-08-11Cache_file: use is_file() for checking instead of file_exists().tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-10Merge branch '3.1-stable' into developAndrey Andreev17-382/+50
2016-08-10Merge pull request #4758 from butane/uri_scheme_caseAndrey Andreev3-3/+3
URI schemes are not case-sensitive
2016-08-10Merge pull request #4758 from butane/uri_scheme_caseAndrey Andreev3-3/+3
URI schemes are not case-sensitive
2016-08-10Better usageVivek Dinesh2-2/+2
Based on GitHub discussion. Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-10Merge pull request #4755 from tianhe1986/develop_not_replace_is_doubleAndrey Andreev1-1/+0
CI_Unit_test: Do not replace "is_double" with "is_float".
2016-08-10Merge pull request #4755 from tianhe1986/develop_not_replace_is_doubleAndrey Andreev1-1/+0
CI_Unit_test: Do not replace "is_double" with "is_float".
2016-08-10Merge pull request #4754 from tianhe1986/develop_fix_unit_test_nameAndrey Andreev1-1/+1
CI_Unit_test: Fix translation of result datatype
2016-08-09URI schemes are not case sensitiveVivek Dinesh2-2/+2
Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-09URI schemes are not case sensitiveVivek Dinesh1-1/+1
Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-09CI_Unit_test: Do not replace "is_double" with "is_float".tianhe19861-1/+0
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-09CI_Unit_test: Fix name of visible test items.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-01[ci skip] Fix #4739Andrey Andreev1-1/+2
2016-08-01Merge pull request #4742 from masterklavi/db_fetch_objectAndrey Andreev1-1/+1
Change ... for the sake of change
2016-07-31Changed the return value of CI_DB_result::_fetch_object(..) to objectMasterklavi1-1/+1
2016-07-29Fix #4737Andrey Andreev1-2/+2
2016-07-29[ci skip] Fix #4736Andrey Andreev1-1/+1
2016-07-28[ci skip] Use const keyword to define CI_VERSIONAndrey Andreev1-1/+1
Because.
2016-07-28Remove dead code written for PHP 5.2Andrey Andreev14-372/+43
2016-07-28[ci skip] Fix #3919, #4732Andrey Andreev1-6/+2
2016-07-26Merge branch '3.1-stable' into developAndrey Andreev35-301/+391
Conflicts resolved: .travis.yml system/core/CodeIgniter.php system/database/drivers/oci8/oci8_forge.php system/database/drivers/pdo/subdrivers/pdo_oci_forge.php system/helpers/path_helper.php system/libraries/Email.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/contributing/index.rst user_guide_src/source/general/requirements.rst user_guide_src/source/general/styleguide.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrade_310.rst user_guide_src/source/installation/upgrading.rst
2016-07-26[ci skip] Mark the start of 3.1.1 developmentAndrey Andreev1-1/+1
2016-07-26Prepare for 3.1.0 releaseClaudio Galdiolo1-1/+1
2016-07-26[ci skip] WhitespaceAndrey Andreev1-1/+1
2016-07-26Fix SQLi in ODBC driversAndrey Andreev2-124/+118
2016-07-26Merge pull request #4709 from nopesled/developAndrey Andreev1-1/+1
Filter php:// wrappers in set_realpath() helper
2016-07-26Merge pull request #4709 from nopesled/developAndrey Andreev1-1/+1
Filter php:// wrappers in set_realpath() helper
2016-07-25Merge pull request #4725 from tianhe1986/develop_url_encode_case_insensitiveAndrey Andreev1-2/+2
Fix remove_invisible_characters() for URL-encoded characters in upper case
2016-07-25Merge pull request #4724 from tianhe1986/develop_is_https_strtolowerAndrey Andreev1-1/+1
Compare X-Forwarded-Proto case-insensitively
2016-07-25Merge pull request #4725 from tianhe1986/develop_url_encode_case_insensitiveAndrey Andreev1-2/+2
Fix remove_invisible_characters() for URL-encoded characters in upper case
2016-07-22Replace url_encoded invisible characters case-insensitively.tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-07-22Call strtolower before comparing $_SERVER['HTTP_X_FORWARDED_PROTO'].tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-07-22Fix #4712Andrey Andreev1-10/+23
2016-07-22Fix #4713Andrey Andreev1-4/+9
2016-07-19Merge pull request #4705 from tianhe1986/develop_upload_raw_nameAndrey Andreev1-1/+1
Improve #4691
2016-07-19Merge pull request #4705 from tianhe1986/develop_upload_raw_nameAndrey Andreev1-1/+1
Improve #4691
2016-07-19Fix #4695Andrey Andreev1-4/+2
2016-07-19Fix #4679Andrey Andreev1-2/+2
2016-07-19[ci skip] Fix an undefined index for 'timeout' in Redis session driverAndrey Andreev1-2/+3
http://forum.codeigniter.com/thread-64219.html
2016-07-11Use negative length for speeding up.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-07-07Update path_helper.phpnopesled1-1/+1
2016-07-07Update path_helper.phpnopesled1-1/+1
Protect against RFI via php:// wrapper
2016-07-06Merge pull request #4691 from chestnutprog/developAndrey Andreev1-1/+1
[ci skip] Fix a bug in CI_Upload::data()
2016-07-06Update Upload.phpchestnutprog1-1/+1
特殊文件名可能会引起bug
2016-06-28[ci skip] Add changelog entries for PR #4678Andrey Andreev2-2/+0
2016-06-28Merge pull request #4678 from kenjis/fix-oci8_forgeAndrey Andreev2-4/+69
DBForge adjustments for Oracle
2016-06-28Remove duplicated $_create_table_ifkenjis1-7/+0
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2016-06-27Fix oci8_forgekenjis2-0/+72
* Oracle does not have `create table if exists` * Oracle has only NUMBER for integer Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2016-06-22Fix #4674Andrey Andreev2-2/+10
2016-06-22Fix #4675Andrey Andreev1-3/+5