summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
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
2011-11-16Migrations - Changed config migration_version to state it is used in ↵Eric Barnes1-17/+17
migration->current. Removed white space and coding standards.
2011-11-14Tweaking the xss filter for IE <comment> tags, parameter injection, and ↵Pascal Kriete1-50/+41
weird html5 attributes.
2011-11-14Removing stray docblocksPascal Kriete1-12/+0
2011-11-13Added TLS and SSL support to Email library. Fixes issue #171Radu Potop1-1/+19
2011-11-13Resolved issue 65 - made action on form_open_multipart helper function call ↵Ben Edmunds1-1/+1
optional
2011-11-13Fix invalid datetime formatSyahril Zulkefli1-3/+3
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-13Fix invalid datetime formatSyahril Zulkefli1-3/+3
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-12Fixed small typeoCloudmanic Labs, LLC1-1/+1
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-08Added ->db->replace() for MySQLi.Phil Sturgeon1-0/+19
2011-11-08Enables real page numbers for URI segment in Pagination libraryAaron Kuzemchak1-12/+73
2011-11-07Adding auto-detection of best redirect method in url_helper.Brandon Jones1-1/+7
2011-11-02Fix #8 - Load core classes from the application folder first.Shane Pearson1-3/+3
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-31Misc formatting fixesTimothy Warren1-7/+8
2011-10-31Set charset in DSN if PHP >= 5.3.6Timothy Warren1-1/+7
2011-10-31Changed mysql charset to PDO optionTimothy Warren1-4/+7
2011-10-28add html_escape() function to escape HTML.kenjis1-0/+24
2011-10-27Added 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-10-27Fixed issue #150 correctly.Phil Sturgeon2-6/+6
2011-10-27Fixed issue #150 (for mysql and mysqli), now returns the actual column length.danmontgomery4-15/+25
2011-10-27Fixed a bug (#200) where MySQL queries would be malformed after calling ↵Greg Aker9-0/+9
db->count_all() then db->get()
2011-10-27Fixed LIKE statement escaping issuesTimothy Warren1-12/+13
2011-10-27Crypt isn't set and it causes extensive script time when specifying a custom ↵Sean Fisher1-5/+5
SMTP server
2011-10-27Bumped CodeIgniter version to 2.1.0.Phil Sturgeon1-1/+1