summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-05-19Merge pull request #3052 from vlakoff/mimeAndrey Andreev2-13/+15
Fix caching of MIME config
2014-05-19Remove static cache in Email->_mimes_types()vlakoff1-9/+1
Saving one function call isn't worth the code overhead.
2014-05-19Fix caching of MIME configvlakoff2-10/+20
* in get_mimes(): was missing isset() test * in Email->_mimes_types(): static cache of reference was noneffective refs 6ef498b49946ba74d610b3805fb908b163a7f03a
2014-05-19Merge pull request #3053 from vlakoff/get_configAndrey Andreev1-7/+4
Simplify code in get_config()
2014-05-19Simplify code in get_config()vlakoff1-7/+4
Exact same behavior. The reference was just redundant.
2014-05-18[ci skip] Add a note to CI_Model::__get() (issue #3046)Andrey Andreev1-0/+4
2014-05-18Merge pull request #3056 from vlakoff/docblockAndrey Andreev1-1/+1
Adjust docblock of load_class()
2014-05-18Merge pull request #3055 from ilatif/developAndrey Andreev1-1/+1
Fixed wrong url for Style Guide in Contributing Guide
2014-05-18Adjust docblock of load_class()vlakoff1-1/+1
refs c26b9ebb00e29be2e972fece3bcf73d33249a64b
2014-05-17Fixed wrong url for Style Guide in Contributing GuideImran Latif1-1/+1
2014-05-17Merge pull request #3050 from emmanuelgrognet/developAndrey Andreev1-1/+1
fix wrong if expression in link_tag
2014-05-16[ci skip] Manually apply an improved version of PR #3034 (doc fixes)Andrey Andreev1-4/+4
2014-05-16fix wrong if expression in link_tagEmmanuel Grognet1-1/+1
2014-05-15Merge pull request #3047 from Celc/patch-1Andrey Andreev1-1/+1
Typo boolen => boolean
2014-05-15Typo boolen => booleanKit Sunde1-1/+1
2014-05-14[ci skip] Add a note about QB escaping field namesAndrey Andreev1-4/+8
2014-05-09Suppress PHP 5.6 E_DEPRECATED warnings for mbstring.internal_encoding as wellAndrey Andreev2-2/+4
2014-05-09Fix PHP 5.6 charset-related warnings in testsAndrey Andreev1-2/+5
2014-05-09Add hash_equals() to ext/hash compat layerAndrey Andreev4-6/+89
Introduced in PHP 5.6 Beta 1 (unfortunately, still undocumented). RFC: https://wiki.php.net/rfc/timing_attack (Yes, I am aware that the RFC talks about hash_compare(), the function was later renamed in the implementation.)
2014-05-09Call data_seek(0) only if we've used DB_result::*row*() methodsAndrey Andreev1-3/+3
This should fix HHVM where it throws 'Unable to jump to row 0 on MySQL result index X' error messages for ext/mysqli
2014-05-09Remove (most of) error suppression from database drivers (issue #3036)Andrey Andreev17-56/+61
2014-05-08Merge pull request #3039 from mdunisch/developAndrey Andreev1-2/+2
Remove error-masking '@' in mysqli_driver (See: #3036)
2014-05-08Merge pull request #3041 from egig/developAndrey Andreev1-0/+1
Prepare image url.
2014-05-08Removed empty lineegig1-1/+1
2014-05-08[ci skip] Update a comment for CI_Input::input_stream()Andrey Andreev1-2/+2
2014-05-08Removed empty line.egig0-0/+0
2014-05-08Merge pull request #3040 from adrianorsouza/platform_supportAndrey Andreev1-1/+2
Added support for Symbian OS platforms to recognize Nokia devices
2014-05-08Prepare image url.egig1-1/+2
2014-05-08Added support to Symbian OS platforms to recognize Nokia devicesAdriano Rosa1-1/+2
2014-05-07Remove error-masking '@' in mysqli_driver (See: ↵mdunisch1-2/+2
https://github.com/EllisLab/CodeIgniter/issues/3036)
2014-05-06Account for PHP 5.6 changes related to charsetsAndrey Andreev1-2/+10
2014-05-06Merge pull request #3037 from DevelopmentDocumentopia/xss_clean_patchAndrey Andreev1-1/+1
xss_clean is not protecting GET requests that &item=/startwithslash
2014-05-06xss_clean is not protecting GET requests that &item=/startwithslashDocumentopia.com1-1/+1
/webacd.do?isurlact=true&entactname=/webacd.do becomes /webacd.do?isurlact=true&entactname;=/webacd.do This commit adds / to the regex to it will escape those GET requests related to issue #3030
2014-05-01Fix a typoAndrey Andreev1-1/+1
2014-05-01PHPUnit, what's wrong with you?Andrey Andreev1-2/+0
2014-05-01Merge pull request #3027 from abdmaster/fix/db_transaction_failureAndrey Andreev1-0/+9
Added `_trans_failure` property to fix PHP Warning.
2014-05-01Optimization in CI_URI::_set_uri_string()Andrey Andreev1-1/+1
2014-05-01Merge pull request #3028 from vlakoff/phpdocAndrey Andreev1-1/+3
Fix docblock of URI->rsegments property
2014-05-01Fix docblock of URI->rsegments propertyvlakoff1-1/+3
2014-04-30Added `_trans_failure` property to fix PHP Warning.Ahmedul Haque Abid1-0/+9
2014-04-29Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev4-5/+5
2014-04-29Small fixes (PR #3022)Andrey Andreev2-3/+3
- Fix incorrect variable in mb_strlen() compat - Micro-optimization of array_replace(), array_replace_recursive() compat
2014-04-25Merge pull request #3014 from vlakoff/variousAndrey Andreev4-5/+5
Various fixes
2014-04-25Minor fixesvlakoff4-5/+5
2014-04-20Merge pull request #3017 from kakysha/developAndrey Andreev1-2/+2
Doc fix for Encryption library
2014-04-19Doc fix for Encryption libraryKakysha1-2/+2
2014-04-15Merge pull request #3006 from vlakoff/securityAndrey Andreev1-1/+1
Fix in $_protected array of register_globals security procedure
2014-04-15#3005Andrey Andreev1-2/+1
2014-04-15Fix in $_protected array of register_globals security procedurevlakoff1-1/+1
* Followup to b78a8c7d40446a3e2e36772706662fd033fe7d1d * Just FYI, renamed to "system_path" in 0c1e405437ceb3c1888e151e6a400653310ad6c1
2014-04-15Fix #3004Andrey Andreev2-53/+52