summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-12-10Merge branch 'dev/xss' into developbrian9781-1/+1
2012-12-10Fixed bug with regexp that matched tagsbrian9781-1/+1
2012-12-09Merge remote-tracking branch 'upstream/develop' into developbrian97814-96/+92
2012-12-08All the HEX code must be replaced or else some XSS attacks can be successfulbrian9781-3/+11
2012-12-08All the HEX code must be replaced or else some XSS attacks can be successfulbrian9781-3/+11
2012-12-08Merge remote-tracking branch 'upstream/develop' into dev/hex_xssbrian97814-96/+92
2012-12-08Merge pull request #2059 from aaronadamsTO/developAndrey Andreev2-3/+4
Fix URL helpers to recognize protocol-relative URLs.
2012-12-08While most of CodeIgniter supports protocol-relative URLs, a few URL helpers ↵Aaron Adams1-3/+3
do not. Most notably, redirect('//www.facebook.com/aaronadams') led my browser to https://aaronadams.ca/index.php/www.facebook.com/aaronadams. In this commit, I have fixed the header() helper, along with the anchor() and anchor_popup() helpers, to be compatible with protocol-relative URLs. Signed-off-by: Aaron Adams <aaron@aaronadams.ca>
2012-12-08Added changelog entry.Aaron Adams1-0/+1
Signed-off-by: Aaron Adams <aaron@aaronadams.ca>
2012-12-07[ci skip] Correct a changelog entryAndrey Andreev1-1/+1
2012-12-07Fix issue #2061Andrey Andreev2-9/+10
2012-12-06Another use of CI_URI::_remove_relative_directory()Andrey Andreev1-1/+1
2012-12-06Merge pull request #2055 from chernjie/developAndrey Andreev1-1/+26
Bug fix for relative directory removal
2012-12-06Updated formatting and styleguide, thanks narfbg;CJ1-7/+13
2012-12-06Bug fix for relative directory removalchernjie1-1/+20
This fixes two bugs: - for segments that ends with ".." e.g. /user/username../details, this should not be replaced - current solution only replace double slashes, this solutions removes the infinite number of recurring slashes
2012-12-04Remove CI_DB_oci8_result::data_seek()Andrey Andreev1-63/+0
It can only call oci_execute() in order to reset the pointer to 0, the oci8 driver doesn't support setting the pointer. Due to the result_object(), result_array() and custom_result_object() calling data_seek() every time prior to fetching the result set, this only causes the query to be executed twice. All of the three methods now cast from existing result_object and/or result_array sets, so the probability to ever need to really fetch the result set again is practically zero and so this method doesn't bring any benefit.
2012-12-04Rename DB_result _data_seek() to data_seek() and make it publicly availableAndrey Andreev11-25/+57
(as requested in #2050)
2012-12-03Added small improvement to the _remove_evil_attributes functionbrian9781-6/+5
Signed-off-by: brian978 <dbrian89@yahoo.com>
2012-12-03Fix postgre db_connect()Andrey Andreev1-6/+6
2012-12-03Add min_width and min_height options to the Upload classAndrey Andreev4-48/+109
(manually implementing outdated PR #636)
2012-12-03Improve schema support for PostgreAndrey Andreev3-12/+44
2012-12-03[ci skip] Cleaned some spacesAndrey Andreev46-93/+85
2012-12-03Merge pull request #2048 from vlakoff/developAndrey Andreev1-7/+10
config->site_url() optimizations
2012-12-03config->site_url(): remove useless castvlakoff1-1/+1
thanks to narfbg
2012-12-03config->site_url() optimizationsvlakoff1-7/+10
- direct access to config array, instead of item() calls - the string cast is just in case 'url_suffix' would be set to false or null; the function produces the same results without this cast, but it leads to a robuster code, as false and null are sanitized and skip the suffix insertion code - altered conditional structure: if no suffix, skip the appending of an empty string to $uri
2012-11-30Merge pull request #2043 from johnathancroom/keep_flash_data_arrayAndrey Andreev1-0/+50
Test for keep_flashdata accepting an array
2012-11-30keep_flashdata array testJohnathan Croom1-1/+51
2012-11-30Add CI_Output::delete_cache()Andrey Andreev3-4/+51
(an improved version of PR #609)
2012-11-29Fix #2041Andrey Andreev3-21/+25
2012-11-29Added CI_Output::get_header()Andrey Andreev4-7/+96
(an improved version of PR #645) Also fixed get_content_type() to only return the MIME value and created Output library unit tests for both of these methods.
2012-11-28Fix #2037Andrey Andreev1-6/+8
2012-11-28Merge pull request #2036 from williamknauss/developAndrey Andreev1-3/+10
Children Drivers
2012-11-28Remove CommentWilliam Knauss1-1/+0
As requested removed useless comment
2012-11-27Children DriversWilliam Knauss1-3/+11
This allows developers to create children drivers that are not prefix with "CI_". This is a nity grity change, however it keeps with the mindset that class names that start with CI_ are typically overrides of core classes.
2012-11-26Fix some erroneous variable names (sorry)Andrey Andreev2-3/+3
2012-11-26Update Language helper test caseAndrey Andreev1-1/+1
2012-11-26Language helper lang() to accept optional HTML attributesAndrey Andreev3-10/+12
(an improved version of PR #1235)
2012-11-26Implement cascade-style loading of language filesAndrey Andreev3-36/+44
(as requested in issue #452)
2012-11-26Add 'valid_url' rule to Form Validation (issue #1966)Andrey Andreev3-2/+46
2012-11-26CI_Email::print_debugger() option to limit the type of data to be printedAndrey Andreev3-3/+35
(an alternative to PR #1759; partially solves issue #1742)
2012-11-26Switch CI_Form_validation:: to publicAndrey Andreev1-1/+1
Makes it easier to access the data after validation (issue #1208)
2012-11-26Manually implement PR #2033Andrey Andreev1-1/+1
Check for an empty encryption_key shouldn't use strict comparison.
2012-11-25Merge pull request #2026 from johnathancroom/keep_flash_data_arrayAndrey Andreev3-3/+17
keep_flashdata accepts array
2012-11-25Changelog changeJohnathan Croom1-1/+1
2012-11-25Improved array keey_flashdata + ChangelogJohnathan Croom2-13/+16
2012-11-25Fix #2027Andrey Andreev6-13/+79
2012-11-25create database for mysqli testsAndrey Andreev1-1/+1
2012-11-25MySQLi testsAndrey Andreev5-0/+82
2012-11-25Revert some of the changes from PR #2029Andrey Andreev2-43/+25
We have file naming conventions and any extension filename needs to match MY_<orig_filename>, so we don't need to check for lowercase equivalents.
2012-11-25Merge pull request #2029 from dchill42/driver_extAndrey Andreev11-126/+352
Added driver extension support