summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2012-12-18Merge remote-tracking branch 'upstream/develop' into developbrian97812-113/+147
2012-12-17[ci skip] Fix some spacesAndrey Andreev2-2/+2
2012-12-17Merge pull request #2077 from AndrewPodner/developAndrey Andreev8-71/+71
update for Issue #2064 - take 2
2012-12-17update for Issue #2064 (changed docblocks which return $this or only call a ↵Andrew Podner8-71/+71
method that returns $this to @return CI_DB_class_name)
2012-12-17Merge pull request #2069 from willmendesneto/developAndrey Andreev1-4/+6
Minify output in css and javascript code
2012-12-17Fix 2073Andrey Andreev1-1/+1
2012-12-17Fix #2074Andrey Andreev1-1/+1
2012-12-17Fix function_usable()Andrey Andreev1-6/+11
2012-12-15Fix #2072Andrey Andreev1-1/+1
2012-12-14Minify output in css and javascript codeWill Mendes1-4/+6
Minify output in css and javascript code
2012-12-14Fix issue #539Andrey Andreev2-30/+36
Form validation language line keys were not prefixed. They are now prefixed with 'form_validation_' in order to avoid collisions. The old keys will still work if a prefixed match is not found, but are DEPRECATED and will be removed in the next major version. Also added upgrade notes and changelog entries for the new error message format from PR #961.
2012-12-12Find/replace oopsie.Eric Roberts1-2/+2
Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-12Format tweaksEric Roberts1-2/+2
Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-12Merge branch 'refs/heads/develop' into feature/form_error_msgsEric Roberts173-12099/+22244
Conflicts: system/language/english/form_validation_lang.php user_guide_src/source/libraries/form_validation.rst Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-11Modified regexp to match partial tagsbrian9781-2/+2
2012-12-10Removed boundary from regexpbrian9781-1/+1
2012-12-10Fixed bug with regexp that matched tagsbrian9781-1/+1
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_xssbrian97812-84/+51
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-07Fix issue #2061Andrey Andreev1-9/+9
2012-12-06Another use of CI_URI::_remove_relative_directory()Andrey Andreev1-1/+1
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 Andreev9-13/+18
(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 Andreev2-1/+53
(manually implementing outdated PR #636)
2012-12-03Improve schema support for PostgreAndrey Andreev2-12/+43
2012-12-03[ci skip] Cleaned some spacesAndrey Andreev34-81/+73
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-30Add CI_Output::delete_cache()Andrey Andreev1-0/+39
(an improved version of PR #609)
2012-11-29Fix #2041Andrey Andreev1-2/+3
2012-11-29Added CI_Output::get_header()Andrey Andreev1-1/+34
(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-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-26Language helper lang() to accept optional HTML attributesAndrey Andreev1-4/+5
(an improved version of PR #1235)
2012-11-26Implement cascade-style loading of language filesAndrey Andreev1-11/+22
(as requested in issue #452)
2012-11-26Add 'valid_url' rule to Form Validation (issue #1966)Andrey Andreev1-0/+42
2012-11-26CI_Email::print_debugger() option to limit the type of data to be printedAndrey Andreev1-2/+23
(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 Andreev1-1/+12
keep_flashdata accepts array
2012-11-25Improved array keey_flashdata + ChangelogJohnathan Croom1-13/+15
2012-11-25Fix #2027Andrey Andreev6-13/+79