summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-07-23Merge pull request #3990 from lonnieezell/f/dbobjectsAndrey Andreev1-0/+85
[ci skip] Adding Custom Result object documentation to Query Results docs
2015-07-23Fix an issue with CI_Upload max filesizeAndrey Andreev2-0/+17
Reported via the forums: http://forum.codeigniter.com/thread-62510.html
2015-07-23Tabs vs Spaces and the forgotten rewrite.Lonnie Ezell1-6/+6
2015-07-22Revamping User class example for Custom Result ObjectsLonnie Ezell1-8/+5
2015-07-22Fix testcases broken by b63dc1904e4f34cb48d7dce80155172c6e94d777Andrey Andreev1-2/+2
2015-07-22Remove eval()-related logic from function_exists()Andrey Andreev1-13/+3
#3991 shows that all such checks are useless as function_exists('eval') will always return FALSE.
2015-07-22Add class_exists() checks to CI_Loader::model()Andrey Andreev2-12/+27
Helps debugging in case of controller/model/library class name collision.
2015-07-22Fix #3991Andrey Andreev3-1/+4
2015-07-22Rewording and typosLonnie Ezell1-13/+14
2015-07-21Added missing space.Lonnie Ezell1-1/+1
2015-07-21Adding Custom Result object documentation to Query Results docs.Lonnie Ezell1-0/+87
2015-07-21Fix #3989Andrey Andreev2-12/+5
More instances of the bug that was fixed with 43afc71b777b00cfc2638add6fa3c47d333c5e04
2015-07-20Merge pull request #3987 from calvintam236/developAndrey Andreev1-1/+1
[ci skip] Fixed a typo in tests/README.md
2015-07-20Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into developCalvin Tam39-210/+443
2015-07-20Fixed typoCalvin Tam1-1/+1
2015-07-20Fix #3279Andrey Andreev2-4/+5
2015-07-20[ci skip] Update user-guide with info about 2.2.2, 2.2.3Andrey Andreev6-3/+60
2015-07-20[ci skip] Fix a docs compile warningAndrey Andreev1-1/+1
2015-07-20[ci skip] Add upgrade instructions for 3.0.1Andrey Andreev2-1/+21
2015-07-20[ci skip] Apply changes from PR #3983 to error_exception.phpAndrey Andreev2-20/+14
2015-07-20Merge pull request #3983 from kenjis/fix-cli-error-phpAndrey Andreev1-13/+11
[ci skip] Fix errors/cli/error_php.php output
2015-07-20Fix indentationkenjis1-4/+4
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2015-07-20[ci skip] Add a changelog entry for last commitAndrey Andreev1-0/+1
2015-07-20Fix an internal bug in QB where() escapingAndrey Andreev1-4/+1
This is not a supported use case, but if QB escaping is force-disabled, string values passed to where() or having() aren't escaped. That's wrong because escape-disabling should only be possible for identifiers and not values. Reported via the forums: http://forum.codeigniter.com/thread-62478.html
2015-07-20[ci skip] Fix #3985Andrey Andreev1-1/+1
2015-07-18Fix errors/cli/error_php.php outputkenjis1-13/+11
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2015-07-17Fix #3752Andrey Andreev2-21/+23
2015-07-17[ci skip] Fix #3778Andrey Andreev2-15/+7
2015-07-17[ci skip] Fix a bug reported via PR #3704Andrey Andreev2-23/+21
2015-07-17Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey Andreev1-2/+2
2015-07-17Merge pull request #3980 from kenjis/patch-2Andrey Andreev1-2/+2
[ci skip] Fix sample code
2015-07-17Fix sample codekenjis1-2/+2
2015-07-16Add 'ssl_verify' option for mysqli driverAndrey Andreev3-0/+7
MYSQLI_OPT_SSL_VERIFY_SERVER_CERT is an undocumented option that may not always be available. Reference: http://svn.php.net/viewvc/php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt?view=markup&pathrev=302897
2015-07-16[ci skip] Update DB configuration docs with new SSL optionsAndrey Andreev1-10/+15
2015-07-16Add SSL support for PDO_MYSQL tooAndrey Andreev3-4/+31
Related: #3896
2015-07-16Improve the ssl_cipher check for MySQLiAndrey Andreev1-9/+9
Related: #3896
2015-07-16[ci skip] Add note about colon-separated ssl_cipher listAndrey Andreev1-1/+1
2015-07-16Refactor proposed changes from PR #3896Andrey Andreev3-45/+39
2015-07-16Merge branch 'feature/mysqli-ssl' of github.com:ndigitals/CodeIgniter into ↵Andrey Andreev3-5/+67
feature/mysqli_ssl
2015-07-16[ci skip] Fix #3869Andrey Andreev2-1/+8
Close #3978 Close #3979
2015-07-15[ci skip] Add changelog entries for PR #3828Andrey Andreev2-2/+14
2015-07-15[ci skip] Revert styleguide violations from PR #3828Andrey Andreev1-3/+3
2015-07-15Merge branch 'patch-1' of github.com:w0den/CodeIgniter into feature/output_cacheAndrey Andreev1-7/+28
2015-07-15[ci skip] Add a changelog entry for PR #3715Andrey Andreev1-0/+1
2015-07-15Merge pull request #3715 from infinit89/patch-1Andrey Andreev1-1/+1
[ci skip] Fix pagination links with protocol-relative URLs
2015-07-15Merge pull request #3977 from MSDehghan/developAndrey Andreev1-1/+1
[ci skip] Fix a log message typo
2015-07-15Polish changes from PR #3893Andrey Andreev3-39/+31
2015-07-15Fix a TypoMohammad Sadegh Dehghan Niri1-1/+1
2015-07-15Merge branch 'feature/form_helper' of github.com:darkhouse/CodeIgniter into ↵Andrey Andreev3-22/+56
feature/form_helpers_extra_array Manually fixed conflicts in: user_guide_src/source/changelog.rst
2015-07-15[ci skip] Add changelog entry for PR #3968Andrey Andreev1-0/+1