summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-09-05Backport a fix for oci8_result::num_rows()Andrey Andreev1-6/+4
2012-08-01Style fix and changelog entry for pull #1675Andrey Andreev2-1/+2
2012-08-01Merge pull request #1675 from Dentxinho/patch-1Alex Bilbie1-1/+1
Fix warning by profiler when userdata has objects
2012-07-31Fix warning by profiler when userdata has objectsRaul Baldner junior1-1/+1
If session data has objects and profiler is enabled, a warning is trown: > A PHP Error was encountered > Severity: Warning > Message: htmlspecialchars() expects parameter 1 to be string, object given > Filename: libraries/Profiler.php > Line Number: 514
2012-07-24Change is_loaded() to return a referenceAndrey Andreev1-1/+1
2012-07-18Backport fix for issue #1314Andrey Andreev2-2/+6
2012-07-09Alter CI_DB_pdo_result::num_rows()Andrey Andreev1-11/+12
2012-07-04Backport CI_Config::load() optimization from pull #1571Andrey Andreev1-6/+6
2012-07-02Fix issue #1543Andrey Andreev2-6/+13
2012-06-29Bumping version number to 2.1.2.Wes Baker147-146/+243
2012-06-29Updating XSS cleaning to better handle base64 encoded attributes.Wes Baker1-70/+81
Conflicts: system/core/Security.php
2012-06-13Revert a preg_replace()Andrey Andreev1-1/+1
2012-06-13Switch strstr() argumentsAndrey Andreev1-1/+1
2012-06-13Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1Phil Sturgeon155-160/+165
2012-06-13Revert from() alias escaping fix - it was breaking more stuffAndrey Andreev2-6/+3
2012-06-13Updated downloads page in docs to increment versionsDerek Jones1-1/+2
2012-06-13Updating version number and release date for 2.1.1Derek Jones140-140/+140
2012-06-11Fixed conflictsPhil Sturgeon15-38/+207
Why were there conflicts merging into master?
2012-06-07Revert a changeAndrey Andreev1-1/+1
2012-06-07Fixed valid_ip() for PHP < 5.2Andrey Andreev1-22/+21
2012-06-07Documenting IPv6 changes and adding update notes.Pascal Kriete4-1/+94
2012-06-07Adding IPv6 support to the Input and Form_validation libraries.Pascal Kriete4-7/+136
2012-05-27Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1-stablePhil Sturgeon1-1/+1
2012-05-27Driver_Library had $lib_name set as static, and used non-staticPhil Sturgeon1-1/+1
2012-05-27Fix an erroneus method nameAndrey Andreev1-1/+1
2012-05-24Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1-stablePhil Sturgeon5-15/+18
2012-05-24Stop travis trying to run unit tests on 2.1-stable.Phil Sturgeon1-0/+4
2012-05-24Fix issue #1387Andrey Andreev3-14/+16
2012-05-24Merge pull request #1389 from jamiefdhurst/2.1-stablePhil Sturgeon2-1/+2
Adding width and height to list of clear variables to fix #1059
2012-05-24Updating change log relating to #1059.Jamie Hurst1-0/+1
2012-05-24Adding width and height to list of clear variables to fix #1059Jamie Hurst1-1/+1
2012-05-23Removed the starting slash from uri_string() documentation.Phil Sturgeon1-1/+1
2012-05-23Added ability to _like paramater side to use 'none', in case one wants to ↵Nithin1-2/+6
query like instead of where without case being sensitive
2012-05-20Merge pull request #1331 from rogeriopradoj/patch-1Phil Sturgeon3-3/+25
Workaround for PDO Driver in 2.1-stable: num_rows doesn't work for SELECT queries
2012-05-19Fix a issue with CI_DB_pdo_result::num_rows()Rogerio Prado de Jesus2-1/+13
In case of SELECT queries PDOStatement::rowCount doesn't work as expected. This commit makes it returns the expected value.
2012-05-19Fix a issue with affect_rows in CI_DB_pdo_driver::_execute()Rogerio Prado de Jesus2-2/+12
In case of SELECT queries PDOStatement::rowCount doesn't work as expected. This commit makes affect_rows be initialized properly. Signed-off-by: Rogerio Prado de Jesus <rogeriopradoj@gmail.com>
2012-05-19Fix issue #726Andrey Andreev2-8/+9
2012-05-17Merge branch 'release/2.1.1'Phil Sturgeon163-359/+560
2012-05-17Added upgrade for 2.1.1 and updated version.Phil Sturgeon155-299/+391
2012-05-17Merge pull request #1366 from aphofstede/2.1-stableAndrey Andreev2-1/+2
Check cookie against md5 regex. 2.1 stable CSRF injection security fix
2012-05-17Use tabs for indentingAlexander Hofstede1-1/+1
2012-05-17Revert "Use tab for indent"Alexander Hofstede3-16/+1
This reverts commit c3eb672ed01c57a543dd8cdf1b90eb4001498c19.
2012-05-17Use tab for indentAlexander Hofstede3-1/+16
2012-05-17Check cookie against md5 regex.Alexander Hofstede2-1/+2
Otherwise, cookie can contain arbitrary injected code that gets sent back directly to the browser.
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-04-23Merge pull request #1274 from Repox/2.1-stablePhil Sturgeon1-1/+1
Corrected the migration_missing_down_method language string
2012-04-23Corrected the migration_missing_down_method language stringRepox1-1/+1
2012-03-04Merge pull request #1116 from tubalmartin/helpers|url|2.1-stablePhil Sturgeon3-23/+24
2.1 stable - An improved url_title helper function
2012-03-04Changelog updatedtubalmartin1-1/+1
2012-03-04User guide updatedtubalmartin1-3/+3