summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2012-05-23Merge pull request #1320 from thallisphp/patch-2Phil Sturgeon1-1/+1
Update system/libraries/Cart.php - To enable integrity when using associative arrays
2012-05-23Merge pull request #1367 from PawelDecowski/developPhil Sturgeon1-11/+0
Remove set_time_limit() call. Fixes #1346
2012-05-23Merge pull request #1357 from timw4mail/errorsPhil Sturgeon1-2/+2
Move errors to views folder
2012-05-23Merge pull request #1365 from sourcejedi/e_strictPhil Sturgeon1-10/+0
If we want E_STRICT, don't suppress it.
2012-05-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren15-69/+64
2012-05-23Removed the parameter use in database drivers' _close() and added a default ↵Andrey Andreev14-60/+48
_close() method in CI_DB_driver + some changelog fixes
2012-05-22Removed a space after comment lineGints Murans1-1/+1
2012-05-22Moved destruct to the end of fileGints Murans1-7/+17
2012-05-22Move closing of database connection to CI_DB_driver->__destruct - #1376Root2-10/+7
2012-05-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren2-2/+15
2012-05-19Fixed return line and commentsJuan Ignacio Borda1-8/+3
2012-05-18added unbuffered_row() to DB_result.php to avoid memory exhausting when ↵Juan Ignacio Borda1-0/+18
dealing with large results.
2012-05-17Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon56-1116/+1154
2012-05-17Fixed conflicts from merging in 2.1.1.Phil Sturgeon1-1/+1
2012-05-17Added upgrade for 2.1.1 and updated version.Phil Sturgeon13-13/+13
2012-05-17Remove set_time_limit() call. CodeIgniter should respect php.ini setting.Pawel Decowski1-11/+0
2012-05-17merge upstreamTimothy Warren54-1103/+1053
2012-05-17Suggested changesTimothy Warren2-2/+2
2012-05-17Update inflector docblocks, add changelog entryTimothy Warren1-5/+5
2012-05-17Merge upstreamTimothy Warren46-601/+657
2012-05-17Clean up the helpersAndrey Andreev6-43/+39
2012-05-17Clean up the librariesAndrey Andreev24-414/+383
2012-05-17Cleanup the core classesAndrey Andreev15-132/+135
2012-05-17Merge pull request #1366 from aphofstede/2.1-stableAndrey Andreev1-1/+1
Check cookie against md5 regex. 2.1 stable CSRF injection security fix
2012-05-17Check cookie against md5 regex.Alexander Hofstede1-1/+1
Otherwise, cookie can contain arbitrary injected code that gets sent back directly to the browser.
2012-05-16If we want E_STRICT, don't suppress it!Alan Jenkins1-10/+0
15be8fc "Changed the 'development' environment default error reporting to included E_STRICT" Not present in any tagged release, so no need for -stable or a changlelog entry.
2012-05-16Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren2-13/+101
2012-05-15Minor changes on the pull #1355 additionsAndrey Andreev1-4/+4
2012-05-15Merge pull request #1355 from shidec/developAndrey Andreev1-0/+93
Escaping boolean data type, some DBMS (e.g., postgre) need it
2012-05-15Escaping boolean data type for postgreSoesapto Joeni Hantoro1-10/+2
2012-05-15Escaping boolean data type for postgreSoesapto Joeni Hantoro1-2/+2
2012-05-15Rollback changes, move it to postgre_driverSoesapto Joeni Hantoro1-4/+0
2012-05-15Rollback changes, move it to postgre_driverSoesapto Joeni Hantoro1-1/+1
2012-05-15Escaping boolean data type on postgreSoesapto Joeni Hantoro1-0/+101
2012-05-15Merge pull request #1324 from toopay/db-testsPhil Sturgeon1-12/+7
Improved DB tests
2012-05-14Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren7-50/+60
2012-05-14Move errors to views folderTimothy Warren1-2/+2
2012-05-13Improve the solution for issue #1342Andrey Andreev1-1/+1
2012-05-11Fix issue #1349Andrey Andreev1-1/+1
2012-05-11User_agent library improvementsAndrey Andreev1-12/+12
2012-05-11Escaping boolean data type, some DBMS (e.g., postgre) need itSoesapto Joeni Hantoro1-1/+1
2012-05-11simpler script, add boolean handling on DB_driver/escapeSoesapto Joeni Hantoro1-14/+4
2012-05-11Generate better conditions statement on boolean field type. Actually boolean ↵Soesapto Joeni Hantoro1-1/+15
field type need TRUE or FALSE value. Common DBMS (e.g., MySQL) can substite this value with 1 or 0, but it can't be implemented on PostgreSQL. So, its better to use TRUE or FALSE value for boolean field type.
2012-05-09Fix issue #1342Andrey Andreev1-1/+1
2012-05-07Added a return false if an image doesn't pass XSS cleaning to prevent ↵Wes Baker1-0/+4
file_get_contents from returning a NULL and passing through unscathed.
2012-05-07Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developWes Baker74-1975/+2934
Conflicts: system/core/Security.php
2012-05-05Merge pull request #1325 from st2/developAndrey Andreev1-1/+1
Update system/database/drivers/interbase/interbase_utility.php
2012-05-05Added a return false if an image doesn't pass XSS cleaning to prevent ↵Wes Baker1-1/+5
file_get_contents from returning a NULL and passing through unscathed.
2012-05-04Update system/database/drivers/interbase/interbase_utility.phpCusco1-1/+1
2012-05-04Merge remote-tracking branch 'upstream/develop' into db-testsTaufan Aditya1-21/+24