summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
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-20Default doctype is now HTML 5Sébastien Adam1-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
2015-12-30Fix #4331Andrey Andreev1-13/+24
2015-12-15Fix logical errors from af849696d43f5c3b68962af1ae5096151a6d9f1aAndrey Andreev3-4/+4
2015-12-15Really fix #4039Andrey Andreev1-1/+1
A typo from 8df6efd402180a6361b4dd619f5535d6c2bed334
2015-12-14Fix erroneous variables from 85bc9fc53e4c3e46b2f4e1b1eac7e2828d4869e6Andrey Andreev3-4/+4
2015-12-14Change DB charset handlingAndrey Andreev5-85/+32
Close #4311
2015-12-14Merge branch '3.0-stable' into developAndrey Andreev18-104/+270
2015-12-14Fix version() for Oracle DB driversAndrey Andreev2-2/+29
2015-12-14Close #4313Andrey Andreev1-0/+12
2015-12-14Fix #4312Andrey Andreev1-6/+3
2015-12-12Complete the proposed changes from PR #4300Andrey Andreev1-16/+3
2015-12-12Merge branch 'develop' of github.com:halmai/CodeIgniter into db/init_exceptionAndrey Andreev1-1/+1
2015-12-12[ci skip] Proper error handling for Sessions on PHP 5Andrey Andreev5-78/+133
This was actually a PHP bug, see https://wiki.php.net/rfc/session.user.return-value Also related: #4039
2015-12-11Fix #4039Andrey Andreev1-0/+6
2015-12-11Fix #4306Andrey Andreev1-1/+1
2015-12-08Remove CI_DB_driver::load_rdriver()Andrey Andreev2-25/+7
2015-12-08Type-hint csv_from_result(), xml_from_result() DB utilitiesAndrey Andreev1-12/+2
Close #4299
2015-12-08rolling back previous solution; throwing exception if database connection ↵Halmai, Csongor2-5/+1
was not successful.
2015-12-07Merge pull request #4291 from b-kaxa/fix-phpdocAndrey Andreev2-1/+2
[ci skip] phpdoc adjustments in CI_Router and CI_URI
2015-12-07replace spaces with tabsb-kaxa1-1/+1
2015-12-07Detecting if database connection was not successfulHalmai, Csongor1-0/+4
2015-12-06fix phpdocb-kaxa2-1/+2
2015-12-03Fix #4283Andrey Andreev1-1/+2
2015-12-01Forgot change in the comment on the meta functionSébastien Adam1-1/+1
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-15 15:25:03 +0100