summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2012-03-09Adding Support to Properly Escape Objects that have __toString() magic ↵Joel Kallman1-1/+1
method so that the object can be passed directly as a parameter in a condition without having to manually convert to a string Signed-off-by: Joel Kallman <jkallman@eclarian.com>
2011-12-15Merge pull request #752 from toopay/pdo_sqliteEric Barnes1-1/+4
Fix for PDO driver, exception for sqlite in DSN spec
2011-12-14Slight syntax change to the Cart classAndrew Seymour1-1/+3
2011-12-14Added in a remove item from cart function to save the "hacky" method of ↵Andrew Seymour1-1/+23
updating a product with 0 quantity, updated the changelog to reflect and to be neater and more readable surrounding the changes of the Cart library
2011-12-13Changed the syntax slightly, @philsturgeon may be claustrophobic as he ↵Andrew Seymour1-1/+1
doesn't like no spaces
2011-12-13Added the ability to get the contents in a different orderAndrew Seymour1-2/+10
2011-12-13Spacing added, @philsturgeon is too picky!Andrew Seymour1-1/+1
2011-12-13Merged the two if's together as suggested by @philsturgeon - updated the ↵Andrew Seymour1-6/+3
Changelog to include something that may be important
2011-12-13Updated Cart.php to handle quantity changes differently (now ↵Andrew Seymour1-5/+23
auto-increments), also updated the changelog to reflect this change for the people that are currently using this library
2011-12-09Added ability to change the separator value in the humanize functionEric Barnes1-9/+9
2011-12-08Exception for sqlitetoopay1-1/+4
2011-12-06Merge pull request #735 from tomasz154/developPhil Sturgeon2-1/+8
Made an "innocuous SQL statement" more innocuous SELECT * FROM was running in the PostgreSQL drivers just for the sake of returning valid SQL, which could of course be insanely slow on large tables.
2011-12-06Merge pull request #647 from tomcode/patch-1Phil Sturgeon1-3/+3
Zip class checks file exists to prevent error warnings in the log
2011-12-06Update system/libraries/Zip.phpThomas Traub1-2/+2
2011-12-06Merge branch 'develop' of https://github.com/michaeljdennis/CodeIgniter into ↵Eric Barnes1-11/+30
michaeljdennis-develop Conflicts: system/libraries/Image_lib.php user_guide/changelog.html
2011-12-06Merge pull request #608 from spol/Image_lib-bugfixEric Barnes1-1/+4
Fixes an issue with the Image_lib class not clearing properties completely
2011-12-05Update system/libraries/Zip.phpThomas Traub1-1/+1
2011-12-05changed _create_table to return true if table already existsTomasz T1-1/+2
2011-12-05changed create_table method to check whether a value returned from driver's ↵Tomasz T1-0/+6
forge is sql or bool (acts exactly as create_database)
2011-12-05Took out the now unnecessary error suppressionThomas Traub1-2/+2
2011-12-04Merge pull request #739 from jeroenvdgulik/feature/logger-chmod-bugEric Barnes1-2/+6
- Stop logger from trying to chmod on each event
2011-12-04- Stop logger from trying to chmod on each event to safe i/o and prevent ↵Jeroen van der Gulik1-2/+6
error messages popping up when the user is different then the webserver
2011-12-04Fix for is_unique when you are not connected to a db. Refs: #724Eric Barnes1-7/+10
2011-12-04Changed pagination construct to call initialize so it sets the anchor class ↵Eric Barnes1-10/+6
properly. Fixes #737
2011-12-04Changed visibility of pagination properties and methods.Eric Barnes1-39/+38
2011-12-02SELECT * FROM isn't that innocuous, changed to SELECT 1Tomasz T1-1/+1
2011-12-01Merge pull request #728 from Repox/developPhil Sturgeon1-1/+8
call_user_func_array() error with $this->db->call_function(). This fixes issue #725
2011-12-01Removed `$_SERVER['REMOTE_ADDR']` following feedbackJack Webb-Heller1-1/+1
2011-12-01CodeIgniter ignores the set config value for Maximum Execution Time, ↵Jack Webb-Heller1-2/+6
overwriting it with its own value of 300 seconds. Whilst this is sensible in the vast majority of situations (browsers), when running a script from CLI, it is likely that execution times may need to be longer. Therefore, don't override the time limit if being run from the CLI - instead default back to PHP's own configuration.
2011-12-01This fixes issue #725Repox1-1/+8
2011-11-29The DB_driver can now use failover databases if specifiedFelix Balfoort1-5/+32
The DB_driver can now use failover databases if specified. If the main connection shouldn't connect for some reason the DB_driver will now try to connect to specified connections in the failover config. Example config: $db['default']['hostname'] = 'localhost'; $db['default']['username'] = ''; $db['default']['password'] = ''; $db['default']['database'] = ''; $db['default']['dbdriver'] = 'mysql'; $db['default']['dbprefix'] = ''; $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; $db['default']['cachedir'] = ''; $db['default']['char_set'] = 'utf8'; $db['default']['dbcollat'] = 'utf8_general_ci'; $db['default']['swap_pre'] = ''; $db['default']['autoinit'] = TRUE; $db['default']['stricton'] = FALSE; $db['default']['failover'] = array(); $db['default']['failover'][0]['hostname'] = 'localhost1'; $db['default']['failover'][0]['username'] = ''; $db['default']['failover'][0]['password'] = ''; $db['default']['failover'][0]['database'] = ''; $db['default']['failover'][0]['dbdriver'] = 'mysql'; $db['default']['failover'][0]['dbprefix'] = ''; $db['default']['failover'][0]['pconnect'] = TRUE; $db['default']['failover'][0]['db_debug'] = TRUE; $db['default']['failover'][0]['cache_on'] = FALSE; $db['default']['failover'][0]['cachedir'] = ''; $db['default']['failover'][0]['char_set'] = 'utf8'; $db['default']['failover'][0]['dbcollat'] = 'utf8_general_ci'; $db['default']['failover'][0]['swap_pre'] = ''; $db['default']['failover'][0]['autoinit'] = TRUE; $db['default']['failover'][0]['stricton'] = FALSE; $db['default']['failover'][0]['failover'] = array(); $db['default']['failover'][1]['hostname'] = 'localhost2'; $db['default']['failover'][1]['username'] = ''; $db['default']['failover'][1]['password'] = ''; $db['default']['failover'][1]['database'] = ''; $db['default']['failover'][1]['dbdriver'] = 'mysql'; $db['default']['failover'][1]['dbprefix'] = ''; $db['default']['failover'][1]['pconnect'] = TRUE; $db['default']['failover'][1]['db_debug'] = TRUE; $db['default']['failover'][1]['cache_on'] = FALSE; $db['default']['failover'][1]['cachedir'] = ''; $db['default']['failover'][1]['char_set'] = 'utf8'; $db['default']['failover'][1]['dbcollat'] = 'utf8_general_ci'; $db['default']['failover'][1]['swap_pre'] = ''; $db['default']['failover'][1]['autoinit'] = TRUE; $db['default']['failover'][1]['stricton'] = FALSE; $db['default']['failover'][1]['failover'] = array(); Signed-off-by: Felix Balfoort <fhjbalfoort@gmail.com>
2011-11-28Fixed sytax error in pdo driverTimothy Warren1-4/+0
2011-11-27Merge branch 'patch-1' of https://github.com/has2k1/CodeIgniter into ↵Eric Barnes1-1/+1
has2k1-patch-1 Conflicts: user_guide_src/source/changelog.rst
2011-11-23Switch disposition set to ternary operationtrit1-6/+1
2011-11-23More style tweakstrit1-0/+3
2011-11-23Changed attachment definition to allow for blank disposition defaulting to ↵trit1-2/+4
attachment - should make things easier for the user who uses a custom name
2011-11-23Added a couple of style tweaks and a note about function change in changelogtrit1-7/+2
2011-11-23Added space after CI_Email for coding standardtrit1-1/+1
2011-11-23Switched order of arguments to maintain compatibilitytrit1-1/+1
2011-11-23Changed the names around againtrit1-2/+2
2011-11-23Changed filepath back to filenametrit1-7/+7
2011-11-23Fixed variable name causing problemtrit1-1/+1
2011-11-23Added custom file name to attach(), updated _build_message to handle ittrit1-10/+16
2011-11-23Merge pull request #691 from jerkob/developPhil Sturgeon1-0/+5
Updated trans_start() and trans_complete() so _trans_depth increments.
2011-11-22Updated trans_start() and trans_complete() so that _trans_depth increments ↵Jacob Terry1-0/+5
correctly Fix for issue #159 and #163.
2011-11-22Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon1-0/+1
2011-11-22Merge master (2.1.0) and fixed conflicts.Phil Sturgeon8-43/+56
2011-11-22Readded PDO drivers.Phil Sturgeon5-15/+565
2011-11-21Added HTTP status code 422 (Unprocessable Entity) to set_status_header()Chris Rosser1-0/+1
2011-11-17auto_link() learned to recognize more URLs has2k11-1/+1
Problem: auto_link() only works on URLs that are preceded by a new line, space, or open parentheses. As a result the URL in the string below would be missed. 'Google<br />http://www.google.com/' Solution: Add a word boundary to the list of features that can precede a URL. Credit to: @scaryuncledevin, issue #419