summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2011-09-14Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren2-16/+26
2011-09-14Fixed LIKE statement escaping issuesTimothy Warren1-6/+22
2011-09-14Marked ->db->affected_rows() function as unavailableTimothy Warren1-1/+5
2011-09-13Changed to PHP5 constructorTimothy Warren1-1/+1
2011-09-13Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren3-4/+5
2011-09-13Update: change _fetch_from_array form private to protectedBo-Yi Wu1-3/+3
2011-09-12Update: modified return bool value on commentBo-Yi Wu2-2/+2
2011-09-12Update: check filter_var function existBo-Yi Wu1-1/+1
2011-09-12Update: add public or private prefix.Bo-Yi Wu1-13/+17
2011-09-12Update: if php version >= 5.2, use filter_var to check validate ip.Bo-Yi Wu1-0/+6
2011-09-10Merge pull request #389 from vjnrv/patch-1Eric Barnes1-1/+1
CI_Profiler => Accepting objects while profiling session data.
2011-09-08Merge pull request #345 from kylefarris/patch-1Phil Sturgeon1-1/+2
Session Class - 'user_data' Has No Default Value
2011-09-07Use NULL as the default value for offset in limit(x, offset) so that default ↵Phil Sturgeon1-2/+2
is not LIMIT 0.
2011-09-07Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-6/+3
2011-09-07Added changelog item, updated since version file headersTimothy Warren4-4/+5
2011-09-06Major speed improvement in function random_string() for cases 'alpha', ↵druu1-6/+3
'alnum', 'numeric' and 'nozero'
2011-09-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren20-129/+190
2011-09-05CI_Profiler => Accepting objects while profiling session data.Pedro Junior1-1/+1
2011-09-03Merge pull request #379 from tomcode/language-set-typosPhil Sturgeon1-1/+1
Changed up to down for down method error line
2011-09-03Changed up to down for down method error lineThomas Traub1-1/+1
2011-09-02fixes potential SQL injection vector in Active Record offset()kenjis1-1/+1
2011-08-30Fixed issue #105 SQL log errorsNiklas Nilsson1-8/+11
Enabled logging database query errors even if $db_debug is not enabled.
2011-08-30Added the 'user_data' key to the userdata property so that sessions using a ↵Kyle Farris1-1/+2
database can be deleted properly when using the table schema found in the "Saving Session Data to a Database" section of the Session Class in the user guide.
2011-08-30Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developGreg Aker16-38/+86
2011-08-30A bit more cleanup in the date helper.Greg Aker1-59/+54
2011-08-30CI Coding standards cleanup in the date helper.Greg Aker1-25/+40
2011-08-30Merge pull request #325 from freewil/developPhil Sturgeon3-10/+19
always use charset config item
2011-08-29Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon2-2/+2
2011-08-28always use charset config itemfreewil2-5/+13
2011-08-28Fixed recent change to $this->db->field_data() which errored for field types ↵Phil Sturgeon2-4/+4
without constraints. It now uses a less expecting regex and defaults to NULL.
2011-08-28Fix the default migration path.bubbafoley1-1/+1
2011-08-28always use charset config itemfreewil3-7/+8
2011-08-26Changed CI_VERSION to represent develop branchEric Barnes1-1/+1
2011-08-26Fixed conflict with changelog.Phil Sturgeon1-0/+1
2011-08-26Removed some error suppression, which would hide a Notice if the path cannot ↵Phil Sturgeon1-1/+1
be read. I discovered this by foolishly passing the file_path, not the full_path but took forever for me to realise this as the error returned (thanks to this error suppression) was "GD is not installed" instead of "File cannot be read". Seeing that notice would have made much more sense.
2011-08-26Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon18-96/+252
2011-08-26Merge pull request #304 from MVUG/mvug_fixes_odbcPhil Sturgeon1-1/+1
odbc calls incorrect parent in construct
2011-08-26changed private functions to protected so MY_URI can override them.Paul1-2/+2
2011-08-25odbc called incorrect parent in constructMichiel Vugteveen1-1/+1
2011-08-25oci8 driver escape string quotes fixMichiel Vugteveen1-0/+1
2011-08-25fixed logical operator OR in core/langFrank Michel1-1/+1
2011-08-25fix for issue #292 with multiple language filesFrank Michel1-2/+2
2011-08-25Merge pull request #291 from kenjis/html_escapeGreg Aker1-0/+24
add html_escape() function to escape HTML.
2011-08-25Merge remote-tracking branch 'alexbilbie/csrf-override' into feature/csrf-verifyEric Barnes1-6/+20
Conflicts: system/core/Security.php
2011-08-25add html_escape() function to escape HTML.kenjis1-0/+24
2011-08-24Updated version function to use PDO constantTimothy Warren2-2/+2
2011-08-24Merge pull request #270 from bubbafoley/extend-autoloaderPhil Sturgeon1-1/+1
make _ci_autoloader() protected so it can be properly extended.
2011-08-24Fixed class comment and reconnect functionTimothy Warren1-2/+6
2011-08-24Merge pull request #268 from bubbafoley/developEric Barnes1-3/+3
Fix #8 - Core classes can now be replaced
2011-08-24Changed doc block options. Fixes #100Eric Barnes1-1/+1