summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-12-06updated changelog with dbforge fixTomasz T1-0/+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-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-01Merge pull request #730 from JackWebbHeller/patch-1Phil Sturgeon1-2/+6
Stop CI overriding the set config value for Maximum Execution Time, when running from CLI
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-29Merge pull request #719 from fhjbalfoort/developPhil Sturgeon4-6/+77
DB_driver failover if a connection cannot be established to the main connection
2011-11-29Changed the array structure in the userguideFelix Balfoort1-16/+36
2011-11-29changed much to many in the documentationFelix Balfoort1-1/+1
2011-11-29Updated change log and and database configuration to include failoverFelix Balfoort2-0/+23
2011-11-29Merge branch 'develop' of github.com:fhjbalfoort/CodeIgniter into developFelix Balfoort0-0/+0
Conflicts: application/config/database.php
2011-11-29The DB_driver can now use failover databases if specifiedFelix Balfoort2-6/+34
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-29The DB_driver can now use failover databases if specifiedFelix Balfoort2-5/+51
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-28Merge pull request #716 from timw4mail/developPhil Sturgeon1-4/+0
Fixed syntax error in PDO driver.
2011-11-28Fixed sytax error in pdo driverTimothy Warren1-4/+0
2011-11-27Merge pull request #690 from Repox/developPhil Sturgeon2-5/+6
Proposal for an updated mod_rewrite suggestion. The existing mod_rewrite example in the documentation led to confusion with new users about how to include CSS, JS and image files.
2011-11-27Merge pull request #628 from kridolfo/patch-1Eric Barnes1-0/+3
Added links to the user guide for Encryption class and Session class.
2011-11-27Merge branch 'patch-1' of https://github.com/has2k1/CodeIgniter into ↵Eric Barnes2-5/+5
has2k1-patch-1 Conflicts: user_guide_src/source/changelog.rst
2011-11-27Updated docs for increment_string example.Eric Barnes1-1/+1
2011-11-24Merge pull request #704 from bitrayne/developPhil Sturgeon3-7/+13
Allow a custom file name for email attachments.
2011-11-24Updating the user agent after being corrected on commit b8daad7Repox1-1/+1
Relates to issue #683.
2011-11-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developRepox2-0/+6
2011-11-23Reworded new attach() section in email user guidetrit1-1/+1
2011-11-23Added an entry for the new Email::attach parameterstrit1-1/+5
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 changelogtrit2-8/+4
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 Sturgeon2-0/+6
Updated trans_start() and trans_complete() so _trans_depth increments.
2011-11-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developRepox9-45/+57
2011-11-22Updated changelog with _trans_depth fix.Jacob Terry1-0/+1
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 Sturgeon3-1/+3
2011-11-22Merge master (2.1.0) and fixed conflicts.Phil Sturgeon9-45/+57
2011-11-22Readded PDO drivers.Phil Sturgeon5-15/+565
2011-11-22Altered the explenation of the rewrite rules to better fit the actual result.Repox1-1/+1
2011-11-22Altered the suggested mod_rewrite rules for removing index.php from URL to ↵Repox1-4/+5
better fit the needs between CI routing and asset files. This suggestion addresses issue #684
2011-11-21Merge pull request #687 from bluefuton/developGreg Aker1-0/+1
Added HTTP status code 422 (Unprocessable Entity) to set_status_header()
2011-11-21Added HTTP status code 422 (Unprocessable Entity) to set_status_header()Chris Rosser1-0/+1
2011-11-21Merge pull request #686 from SneakyDave/developPhil Sturgeon1-1/+1
Typo in "Watermarking Preferences". Configuration parameter is "wm_paddiing".
2011-11-21Typo in "Watermarking Preferences". Configuration parameter is "wm_padding", ↵David Dotson1-1/+1
but it is listed as "padding".
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-12-21 02:41:09 +0100