summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-07-27Close #4004Andrey Andreev2-1/+4
2015-07-27Revert "[ci skip] Add a changelog entry for last commit"Andrey Andreev1-1/+0
This reverts commit 72774470d435b18fac6cb90bc4e4ff2b9e8684a2. Conflicts: user_guide_src/source/changelog.rst
2015-07-27Revert "Fix an internal bug in QB where() escaping"Andrey Andreev1-1/+4
This reverts commit 43afc71b777b00cfc2638add6fa3c47d333c5e04.
2015-07-27Revert "Fix #3989"Andrey Andreev2-5/+12
This reverts commit e1a94d30e2f30cee36f71c246136fb2db34d25df.
2015-07-27[ci skip] Update some query builder examplesAndrey Andreev1-11/+21
Related: #4001
2015-07-26Fix #4000Andrey Andreev2-1/+3
2015-07-26[ci skip] Add a note about CI_Form_validation::set_data()Andrey Andreev1-2/+6
2015-07-26Merge pull request #3999 from aneasystone/doc-proAndrey Andreev1-1/+5
[ci skip] Clarify word_wrap() text helper docs
2015-07-26fix word_wrap produce not clearaneasystone1-1/+5
Signed-off-by: aneasystone <aneasystone@gmail.com>
2015-07-25Merge pull request #3988 from kenjis/fix-views-errors-cliAndrey Andreev2-11/+11
[ci skip] Improve readability in CLI error templates
2015-07-25Fix alignmentkenjis2-6/+6
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2015-07-24[ci skip] Remove some whitespaceAndrey Andreev1-7/+7
2015-07-24Merge pull request #3993 from lonnieezell/f/dbnumrowsAndrey Andreev1-16/+13
[ci skip] Removing use of num_rows() in DB results docs
2015-07-24Merge pull request #3996 from calvintam236/developAndrey Andreev9-9/+9
[ci skip] Fix some docblock typos
2015-07-24Fixed typosCalvin Tam9-9/+9
2015-07-24Revamping to the tune of issetLonnie Ezell1-2/+2
2015-07-23Merge pull request #3995 from rajatsharma94/developAndrey Andreev1-1/+1
set_realpath IP check
2015-07-23Update path_helper.phprajatsharma941-1/+1
2015-07-23Security check updated.rajatsharma941-1/+1
All security check conditions are modified according to CI styleguide.
2015-07-23Update path_helper.phprajatsharma941-1/+1
2015-07-23IP checking false positives and no ipv6 checkrajatsharma941-1/+1
The currently implemented method marks all IPs between 0.0.0.0 - 999.999.999.999 as valid IP Address. Which generates false positives as any IP after 255.255.255.255 is not a valid IP address. Also, there is no check for IPv6 IP addresses. filter_var() solves both the issues.
2015-07-23IP Address checking generates false positives.medhavini1-1/+1
IP Address checking marks all IPs between 0.0.0.0 - 999.999.999.999 as valid IP Address. Which is not true.
2015-07-23[ci skip] Polish changes from PR #3990Andrey Andreev1-15/+18
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-23The little things. :)Lonnie Ezell1-1/+0
2015-07-22Removing use of ->num_rows() in DB results docs.Lonnie Ezell1-16/+14
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-21Fix coding stylekenjis2-10/+10
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
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-20Failed security checkrajatsharma941-2/+1
The implemented security check to make sure the path is NOT a URL can easily be bypassed (gives false negative) for all subdomains. Eg "subdomain.domain.com" should ideally show an error but it does not. The new security check tries to make a fsockopen connection to validate whether the URL is external or not.
2015-07-20Security check failmedhavini1-0/+1
Security check condition to check that the path is NOT a URL may give false negative in case of subdomains. Where URLs don't start with http or www.
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>