summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2017-01-16spelling fixes(1)klemens1-1/+1
2017-01-16spelling fixesklemens23-30/+30
2017-01-16[ci skip] Fix #4985Andrey Andreev1-1/+1
2017-01-11Fixed regex used for loading helpersFabio Spampinato1-1/+1
We want to exactly match a dot, so we have to escape it. I found the bug because in my project I load an helper named `session_php_helper.php`, so the `_php` part gets removed and the `session_helper.php` helper gets loaded instead, this way not even an error was shown.
2017-01-10Merge branch '3.1-stable' into developAndrey Andreev7-66/+150
Conflicts resolved: system/core/CodeIgniter.php system/database/drivers/sqlite/sqlite_driver.php system/database/drivers/sqlite/sqlite_forge.php system/database/drivers/sqlite/sqlite_result.php system/database/drivers/sqlite/sqlite_utility.php system/helpers/email_helper.php system/helpers/smiley_helper.php system/libraries/Cart.php system/libraries/Email.php system/libraries/Image_lib.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php user_guide_src/source/changelog.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst
2017-01-10[ci skip] CI_Image_lib to set gd.jpeg_ignore_warning = 1Andrey Andreev1-0/+10
See #4967
2017-01-10Fix Undefined variable: object errorChris Faulkner1-2/+2
Change the undefined variable $object to $vars when calling get_object_vars(). This fixes an error when passing an object to a view.
2017-01-09[ci skip] Mark the beginning of 3.1.4-devAndrey Andreev1-1/+1
2017-01-09[ci skip] Prepare 3.1.3 releaseAndrey Andreev1-1/+1
2017-01-09Merge branch 'security' into 3.1-stableAndrey Andreev3-43/+72
2017-01-06Merge pull request #4825 from gxgpet/developAndrey Andreev1-9/+3
Download helper improvement on reading phase
2017-01-06[ci skip] Don't set User-Agent header in CI_Email::clear()Andrey Andreev1-1/+0
Ref: #4765
2017-01-06Merge pull request #4765 from viitols/developAndrey Andreev1-0/+1
Fix CI_Email not sending User-Agent header
2017-01-06Merge pull request #4765 from viitols/developAndrey Andreev1-0/+1
Fix CI_Email not sending User-Agent header
2017-01-06[ci skip] Cosmetich changes to CI_Image_lib::get_image_properties()Andrey Andreev1-14/+15
2017-01-06Merge pull request #4457 from KN4CK3R/developAndrey Andreev2-0/+6
Fix CI_Image_lib::get_image_properties() invalid image handling
2017-01-06Merge pull request #4457 from KN4CK3R/developAndrey Andreev2-0/+6
Fix CI_Image_lib::get_image_properties() invalid image handling
2017-01-06Fix FV's valid_mac() on PHP 5.4Andrey Andreev1-1/+1
2017-01-06[ci skip] A cosmetic change to the PR #4251Andrey Andreev1-2/+2
2017-01-06[ci skip] Merge pull request #4251 from dimitribalazs/patch-2Andrey Andreev1-2/+3
Added alt attribute functionality to captcha helper
2017-01-06Add valid_mac() FV ruleAndrey Andreev2-0/+26
Close #3992
2017-01-06[ci skip] Add an empty line to PR #4962 patchAndrey Andreev1-0/+1
2017-01-06[ci skip] Add an empty line to PR #4962 patchAndrey Andreev1-0/+1
2017-01-06[ci skip] Merge pull request #4962 from ytetsuro/patch-2Andrey Andreev1-1/+2
oci8_forge add column bug fix
2017-01-05Address #4963Andrey Andreev1-7/+47
Would supersede PR #4966
2017-01-05Address #4963Andrey Andreev1-7/+47
Would supersede PR #4966
2017-01-05add empty line priorytetsuro1-1/+1
add empty line prior
2017-01-05oci8_forge add column bug fixytetsuro1-1/+2
Notice Error Array to string conversion $this->dbforge->add_column('sample', [ 'column_name1' => [ 'type' => 'char', 'default' => '0' ], 'column_name2' => [ 'type' => 'char', 'default' => '0' ] ]);
2017-01-05[ci skip] || -> ORAndrey Andreev1-1/+1
2017-01-04Close #4904Andrey Andreev2-5/+5
2017-01-04Fix a possible file inclusion vulnerability in CI_Loader::vars()Andrey Andreev1-30/+28
2017-01-04[ci skip] Try to mitigate BREACH attacks against CSRF tokensAndrey Andreev1-6/+35
2017-01-04[ci skip] Protect CSRF verification from timing side-channel attacksAndrey Andreev1-6/+8
2017-01-04Fix an XSS vulnerabilityAndrey Andreev1-1/+1
2017-01-03Fix #4804Andrey Andreev1-1/+1
2017-01-03Merge pull request #4958 from boxsnake/developAndrey Andreev1-1/+1
Fix a bug where QB count_all_results() doesn't take into account qb_cache_orderby
2017-01-03Merge pull request #4958 from boxsnake/developAndrey Andreev1-1/+1
Fix a bug where QB count_all_results() doesn't take into account qb_cache_orderby
2017-01-03[ci skip] Fix 4953Andrey Andreev1-1/+1
2017-01-03[ci skip] Update year number in remaining files that were recently deleted ↵Andrey Andreev10-20/+20
from develop
2017-01-03Update copyright data to 2017Master Yoda162-324/+324
2016-12-31Update copyright data to 2017Master Yoda162-324/+324
2016-12-231. Updated last comit with comment for ↵Alex Fang1-1/+1
https://github.com/bcit-ci/CodeIgniter/pull/4955
2016-12-22Fix bug: DB_query_builder do not add parenthesis for cached group_byAlex Fang1-1/+1
2016-12-16[ci skip] Remove a function_exists() call from CI_Image_libAndrey Andreev1-1/+1
We use this function elsewhere without checking for existence; nobody has complained
2016-12-16Merge pull request #4945 from vlakoff/text_helperAndrey Andreev1-1/+1
Small code simplification in character_limiter()
2016-12-15Small code simplification in character_limiter()vlakoff1-1/+1
2016-12-14Move csrf_verify() call out of CI_InputAndrey Andreev3-24/+7
2016-12-14Isolate CI_Security instantiation from CI_Input; improve testsAndrey Andreev3-11/+10
2016-12-14Drop all PHP 5.3-related codeAndrey Andreev22-1049/+19
2016-12-14Remove dead parameter from form_upload()Andrey Andreev1-2/+1
Close #3558