summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2016-02-09Merge pull request #4323 from ↵Andrey Andreev1-3/+20
jspreddy/sai/log_line_formatting_extensibility_change Refactored CI_Log line formatting to allow extensibility
2016-02-09fix a typo editDamien Grandi1-1/+1
2016-02-09Revert some previous changesDamien Grandi1-3/+3
2016-02-09Update DB_query_builder.php - phpdoc (some incorrect return type)Damien Grandi1-12/+12
Edit of some return type in phpdoc. This can also help to fix some autocompletion troubles in some IDE.
2016-02-08Doc block formatting change.Sai Phaninder Reddy Jonnala1-4/+3
2016-02-05Merge pull request #4424 from jonty-comp/developAndrey Andreev1-3/+16
[ci skip] Fix PHP session_write_close() warning when writing a new session to Redis
2016-02-05Fix regression on PHP7 when regenerating the session (#4362)Jonty Sewell1-1/+3
2016-02-05Setting the flag to FALSE is unnecessary since it defaults to FALSE, ↵Jonty Sewell1-10/+1
therefore this block of code can be reduced to a single statement Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-05Set the _key_exists flag to TRUE when the key does in fact exist. Set it to ↵Jonty Sewell1-2/+7
FALSE if the ID is being regenerated, and set it to TRUE once it's been written. Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-05Add a flag to determine whether the redis key currently exists, and if not, ↵Jonty Sewell1-2/+17
force creation of it at write-time Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-05Revert previous changes - fixing the source of the problem rather than ↵Jonty Sewell1-9/+3
working around it Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-04[ci skip] fix commentClaudio Galdiolo1-1/+1
2016-02-03If attempting to write an empty session to Redis, a key will not actually be ↵Jonty Sewell1-3/+9
created, so when the driver tries to set the expiration timeout on the key, 0 is returned, triggering a warning from session_write_close Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-01-26Merge branch '3.0-stable' into developAndrey Andreev3-24/+55
2016-01-26Fix #4399Andrey Andreev1-15/+28
2016-01-25Fix #4395Andrey Andreev1-1/+15
2016-01-20[ci skip] Remove a trailing space from latest PR mergeAndrey Andreev1-1/+1
2016-01-20Respect $config['cur_page'] variable for paginationjekkos1-1/+5
After upgrading to CI3 I noticed that developers are able to determine the current page counter for pagination based on * Explicit query string parameters * URI segment configuration In earlier versions a developer could still set the current page counter in the pagination lib directly which is useful if you want to use pagination with HTTP POST instead of GET. This could be done by passing $config['cur_page'] = '10'; to the pagination function for link generation. Currently this code has changed and will always try to check whether the uri segment is a valid number or not, even if the cur_page variable was passed in the associative array, and fallback to zero if it fails to validate that result. This can be easily resolved by checking whether the counter was already set with a valid number from the $config array before trying to resolve it from the uri segment. This fix give a developer more flexibility and stop CI from overwriting the externally set value with an incorrect one. Signed-off-by: jekkos <jeroen.peelaerts@gmail.com>
2016-01-20[ci skip] Remove a trailing space from latest PR mergeAndrey Andreev1-1/+1
2016-01-20Merge pull request #4384 from jekkos/pagination-fixAndrey Andreev1-1/+5
Respect $config['cur_page'] variable for pagination
2016-01-20Respect $config['cur_page'] variable for paginationjekkos1-1/+5
After upgrading to CI3 I noticed that developers are able to determine the current page counter for pagination based on * Explicit query string parameters * URI segment configuration In earlier versions a developer could still set the current page counter in the pagination lib directly which is useful if you want to use pagination with HTTP POST instead of GET. This could be done by passing $config['cur_page'] = '10'; to the pagination function for link generation. Currently this code has changed and will always try to check whether the uri segment is a valid number or not, even if the cur_page variable was passed in the associative array, and fallback to zero if it fails to validate that result. This can be easily resolved by checking whether the counter was already set with a valid number from the $config array before trying to resolve it from the uri segment. This fix give a developer more flexibility and stop CI from overwriting the externally set value with an incorrect one. Signed-off-by: jekkos <jeroen.peelaerts@gmail.com>
2016-01-20Fix #4391Andrey Andreev1-7/+11
2016-01-20[ci skip] Fix a documentation error on output cache timesAndrey Andreev1-1/+1
2016-01-20Default doctype is now HTML 5Sébastien Adam1-1/+1
2016-01-15Code styling changes as suggested by narfbgSai Phaninder Reddy Jonnala1-8/+10
2016-01-13[ci skip] Mark the start of 3.0.5 developmentAndrey Andreev1-1/+1
2016-01-11Polish changes from PR #4269Andrey Andreev1-7/+21
2016-01-11Merge branch 'develop' of github.com:sebastienadam/CodeIgniter into ↵Andrey Andreev1-6/+7
feature/html_meta
2016-01-11[ci skip] Merge branch '3.0-stable' into developAndrey Andreev172-172/+172
2016-01-11[ci skip] Update ellislab.com links to https tooAndrey Andreev172-172/+172
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev172-327/+327
2016-01-11[ci skip] Update codeigniter.com links to httpsAndrey Andreev172-327/+327
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev172-344/+344
2016-01-11[ci skip] Bump year to 2016Andrey Andreev172-344/+344
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev15-38/+224
Resolved conflicts: system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php
2016-01-11Fix #4374Andrey Andreev1-0/+12
2016-01-11Merge pull request #4369 from galdiolo/patch-12Andrey Andreev1-10/+6
Optimize transactions check in CI_DB_driver::query()
2016-01-08use 'while' instead of 'if' 'do' 'while'Claudio Galdiolo1-10/+6
2016-01-07MySQL stricton again ... remove the version conditionAndrey Andreev3-3/+3
Ref: #4349
2016-01-07Fix MySQL errors from latest commitsAndrey Andreev3-3/+3
Ref: #4349
2016-01-07Add MySQL stricton changes to mysqli and pdo/mysql driversAndrey Andreev3-20/+55
2016-01-07Fix MySQL's 'stricton' featureAndrey Andreev1-2/+20
2016-01-07Add support for MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERTAndrey Andreev1-2/+15
Available since PHP 5.6.16
2016-01-07[ci skip] Add Oracle 12.1 OFFSET support to PDO_OCI as wellAndrey Andreev1-0/+8
Reference: #4279
2016-01-07Merge branch 'feature/oci_offset' into 3.0-stableAndrey Andreev1-0/+8
2016-01-07Fix #4362Andrey Andreev2-2/+8
2016-01-06[ci skip] Add support for OFFSET with Oracle 12cAndrey Andreev1-0/+8
As requested in #4279
2016-01-06Fix #4337Andrey Andreev4-2/+48
2016-01-04Fix #4350Andrey Andreev1-1/+31
2015-12-30Fix #4343Andrey Andreev1-2/+1
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-11 14:38:05 +0100