summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2017-05-21add pre tag in config and session when arrayLloric Mayuga Garcia1-2/+14
2017-05-10Removing the error suppression op from the file_get_contents() call.Giuseppe Marcelli1-1/+1
2017-05-10Revert "Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow ↵Giuseppe Marcelli1-1/+1
anymore to use the custom result object against cached database results, fixing this, for more info see issue 4665,1351" This reverts commit 8233b1d6fc56347195b3a0411806e197e2e59ad3.
2017-05-10Commit 4763c13c99eab2a720a4d6d913902e5cef4e76ec does not allow anymore to ↵Giuseppe Marcelli1-1/+1
use the custom result object against cached database results, fixing this, for more info see issue 4665,1351
2017-05-09read() in DB_cache does not fail when catching E_WARNING with custom error ↵Giuseppe Marcelli1-1/+1
handler
2017-05-06quizzes singular is doesnt work.Fatih Turan1-0/+1
2017-04-10Fix typo in serializeval()Master Yoda1-1/+1
Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2017-03-26Added method separator as comment.George Petculescu1-0/+2
2017-03-26Added get_loaded_driver() method to Cache.php; updated docs.George Petculescu1-0/+10
2017-03-24Merge branch '3.1-stable' into developAndrey Andreev31-127/+172
Conflicts resolved: system/core/CodeIgniter.php system/core/Common.php system/core/Input.php system/helpers/cookie_helper.php tests/codeigniter/helpers/html_helper_test.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst user_guide_src/source/libraries/input.rst
2017-03-20[ci skip] Mark the start of 3.1.5-devAndrey Andreev1-1/+1
2017-03-20[ci skip] Prepare 3.1.4 releaseAndrey Andreev1-1/+1
2017-03-20Fix Apache header injection vulnerability in set_status_header()Andrey Andreev1-5/+5
2017-03-20Fix #5057Andrey Andreev1-2/+2
2017-03-14Fix #5050Andrey Andreev10-11/+11
2017-03-06Fix #5044; add unit tests for img() HTML helperAndrey Andreev1-1/+1
2017-03-01[ci skip] Remove a misleading comment from the docblock for random_string()Andrey Andreev1-3/+1
2017-02-21Merge pull request #5025 from katsew/introduce-apcu-driverAndrey Andreev2-0/+220
Add APCu driver to CI_Cache
2017-02-21Merge pull request #5017 from tianhe1986/develop_having_inAndrey Andreev1-15/+94
DB_query_builder: Adding having_in(), or_having_in(), having_not_in() and or_having_not_in()
2017-02-20Remove serialization/deserialization arraykatsew1-3/+3
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Remove specific argument from abstractionkatsew1-3/+2
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Align with spaceskatsew1-3/+3
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Remove unused link commentkatsew1-1/+0
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Change author to dev teamkatsew1-1/+1
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Change version commentkatsew1-1/+1
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Do not strip substrings looking like URL encode sequencesvlakoff1-1/+1
2017-02-20Merge pull request #5023 from vlakoff/db-escapeAndrey Andreev1-1/+1
Do not strip substrings looking like URL encode sequences
2017-02-20Add apcu driver into valid driver listkatsew1-0/+1
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Correct method and docskatsew1-16/+16
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-20Create Cache_apcu class and copy source from Cache_apc classkatsew1-0/+221
Signed-off-by: katsew <y.katsew@gmail.com>
2017-02-16Do not strip substrings looking like URL encode sequencesvlakoff1-1/+1
2017-02-15Do not fail if the array pointer is after the elementvlakoff1-0/+1
2017-02-14Don't duplicate is_file and filesize checksZach Ploskey1-10/+5
Move duplicate is_file and file_size checks out of if/else branches. Signed-off-by: Zach Ploskey <zach@ploskey.com>
2017-02-13Adding having_in(), or_having_in(), having_not_in() and or_having_not_in().tianhe19861-0/+72
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-13Using _wh_in() instead of _where_in().tianhe19861-15/+22
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-07Allow to omit trailing slash in config pathsvlakoff3-2/+16
2017-02-06[ci skip] Eliminate a needless array_merge() call from PR #5006 patchAndrey Andreev1-6/+3
2017-02-06Merge pull request #5006 from tianhe1986/develop_commonAndrey Andreev1-8/+8
Fix two bugs with Common Functions
2017-02-04Removing url encoded 127.tianhe19861-0/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-04Loading global mimes config file first, and then environment file.tianhe19861-8/+7
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-02-01Fix a CI_Input::set_cookie() bugAndrey Andreev2-10/+8
Found on StackOverflow: https://stackoverflow.com/questions/41925028/codeigniter-config-overrides-set-cookie-parameters
2017-01-23Merge pull request #4990 from tianhe1986/develop_profilerAndrey Andreev1-5/+5
Two small changes with CI_Profiler
2017-01-23Merge pull request #4991 from verkhoumov/developAndrey Andreev1-5/+0
Removed dead code from show_error()
2017-01-23Merge pull request #4990 from tianhe1986/develop_profilerAndrey Andreev1-5/+5
Two small changes with CI_Profiler
2017-01-21Fixed show_error() for check $exit_statusDmitriy Verkhoumov1-5/+0
At the beginning of the function it checks whether a parameter $status_code is less than 100. Then the parameter $exit_status is formed by summing the $status_code + 9. In this case, the parameter $exit_status can not be more than 108, but somehow it is checked whether the value of the parameter $exit_status over 125. Such a situation can not occur under any circumstances.
2017-01-21Close <pre> tag.tianhe19861-3/+3
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-21Also convert single quotes.tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2017-01-20Don't use each()Andrey Andreev3-23/+21
Will be deprecated in PHP 7.2
2017-01-19hash_pbkdf2() byte-safety again ... actually tell mbstring to use 8bitAndrey Andreev1-2/+2
2017-01-19hash_pbkdf2() byte-safetyAndrey Andreev1-4/+13