summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2011-11-08Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon2-6/+12
2011-11-08Added ->db->replace() for MySQLi.Phil Sturgeon1-0/+19
2011-11-07Adding auto-detection of best redirect method in url_helper.Brandon Jones1-1/+7
2011-10-31Merge pull request #624 from talkingwithsean/developDerek Jones1-5/+5
Crypt isn't set and it causes extensive script time when specifying a cus
2011-10-27Crypt isn't set and it causes extensive script time when specifying a custom ↵Sean Fisher1-5/+5
SMTP server
2011-10-26Misc formatting fixesTimothy Warren1-6/+7
2011-10-26Set charset in DSN if PHP >= 5.3.6Timothy Warren1-0/+6
2011-10-25Changed mysql charset to PDO optionTimothy Warren1-6/+6
2011-10-25Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren3-149/+118
2011-10-22Merge pull request #553 from narfbg/ci-oci8-driver-php5Phil Sturgeon3-149/+118
Cleanup and switch oci8_driver and oci8_result to PHP5 functions.
2011-10-21Minor format fixTimothy Warren1-2/+0
2011-10-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren126-474/+2151
2011-10-21Fix mysql charset bugTimothy Warren1-4/+22
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones127-473/+2154
added notice of license to all source files. OSL to all except the few files we ship inside of the application folder, those are AFL. Updated license in user guide. incrementing next dev version to 3.0 due to licensing change
2011-10-20get_magic_quotes_gpc() to be executed only if PHP version is 5.3 or lowerAndrey Andreev2-5/+13
2011-10-20Some public and protected method declarationsAndrey Andreev3-59/+59
2011-10-20Merge remote-tracking branch 'upstream/develop' into ci-oci8-driver-php5Andrey Andreev11-84/+308
2011-10-19I wasn't following the CI code style guide.diegorivera1-3/+3
2011-10-19I wasn't following the CI code style guide.diegorivera1-3/+3
2011-10-19Update system/libraries/Email.phpdiegorivera1-1/+9
2011-10-19Merge pull request #594 from ktomk/patch-8Derek Jones1-0/+5
CI_Loader::driver() processes empty library. Fixed.
2011-10-18Merge pull request #307 from kylefarris/isue-276Derek Jones1-58/+253
Fix for Issue #276 - Thanks Kyle!
2011-10-17Check for string value before doing str_replace. (Issue #439)Chris Muench1-1/+4
2011-10-16Fixes issue #439 some slashes not escaped in session dataChris Muench1-16/+29
2011-10-15Merge pull request #579 from appleboy/bug/cacheGreg Aker1-2/+2
Fix #576: using ini_get() to detect if apc is enabled or not
2011-10-15Fix #576: using ini_get() to detect if apc is enabled or notBo-Yi Wu1-2/+2
2011-10-14Merged with developmentKyle Farris43-298/+1778
2011-10-13Update: fix typo error #564Bo-Yi Wu1-1/+1
2011-10-10Converted database constructors to PHP5 typeTimothy Warren5-6/+6
2011-10-07Remove another 2 old commentsAndrey Andreev1-2/+0
2011-10-07Cleanup and migrate oci8_driver and oci8_result from deprecated PHP4 to PHP5 ↵Andrey Andreev2-115/+86
style functions
2011-10-07CI_Loader::driver() processes empty library. Fixed.Tom Klingenberg1-0/+5
This causes endless recursion calls _ci_load_class(), see #550
2011-10-07if statment code style updateTimothy Warren1-6/+6
2011-10-07Added check for quote markTimothy Warren1-2/+5
2011-10-07Revert "Added check for quote mark"Timothy Warren1-5/+21
This reverts commit 0e762b32a003dd8a9b805fb95ee7aeb3616c41e3.
2011-10-07Revert "Changed all db constructors to newer syntax, made insert_id() ↵Timothy Warren5-6/+6
function more convenient for postgres on pdo driver" This reverts commit f7a8d86dbc6805a4e52964bbea76738df75b5f35.
2011-10-07Added check for quote markTimothy Warren1-21/+5
2011-10-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren4-10/+14
2011-10-06Merge pull request #483 from markhuot/developGreg Aker1-1/+10
resolve a difference between the two memcache set method parameters
2011-10-06Merge pull request #497 from cenk/uaGreg Aker1-2/+2
Fix a typo on User agent library.
2011-10-06Merge pull request #511 from freewil/typography-helper-dryGreg Aker1-6/+1
remove redundant 'if' in typography helper
2011-10-06Merge pull request #530 from MrHyde/developGreg Aker1-1/+1
newline character ending for link_tag() function result
2011-10-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-2/+64
2011-10-06Changed all db constructors to newer syntax, made insert_id() function more ↵Timothy Warren6-7/+25
convenient for postgres on pdo driver
2011-10-05Changed to escape using PDO::quote()Timothy Warren1-11/+4
2011-10-05Merge pull request #486 from narfbg/ci-issue-60Phil Sturgeon1-2/+64
Fix issues #60 (possible MIME-type injection) and #394
2011-10-05Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-50/+19
2011-10-05Fix location file Security Class to core folderpurwandi1-1/+1
2011-10-05newline character ending for link_tag() function resultMrHyde1-1/+1
2011-10-04Merge pull request #528 from narfbg/ci-core-securityDerek Jones1-50/+19
Clean up and optimize core Security class