From 05186616a0ba51cd7df168ac198b283815c89bf2 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 28 Oct 2006 03:28:01 +0000 Subject: --- system/application/config/config.php | 25 ++++++++++++++++++++++--- system/application/config/database.php | 4 ++-- user_guide/changelog.html | 5 +++-- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/changelog.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/index.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/multiple_apps.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/index.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/security_helper.html | 4 ++-- user_guide/helpers/string_helper.html | 4 ++-- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/nav/nav.js | 1 + user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 4 +++- 104 files changed, 132 insertions(+), 109 deletions(-) diff --git a/system/application/config/config.php b/system/application/config/config.php index 0ed58d940..fc4724010 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -147,9 +147,28 @@ $config['function_trigger'] = 'm'; | Error Logging |-------------------------------------------------------------------------- | +<<<<<<< .mine +| Options are "local" or "gmt". This pref tells the system whether to use +| your server's local time as the master "now" reference, or convert it to +| GMT. See the "date helper" page of the user guide for information +| regarding date handling. +| +*/ +$config['time_reference'] = 'local'; + +/* +|-------------------------------------------------------------------------- +| Error Logging Threshold +|-------------------------------------------------------------------------- +| +| If you have enabled error logging, you can set an error threshold to +| determine what gets logged. Threshold options are: +======= | You can enable error logging by setting a threshold over zero. The | threshold determines what gets logged. Threshold options are: -| +>>>>>>> .r388 +| +| 0 = Disables logging | 0 = Error logging TURNED OFF | 1 = Error Messages (including PHP errors) | 2 = Debug Messages @@ -220,8 +239,8 @@ $config['encryption_key'] = ""; $config['sess_cookie_name'] = 'ci_session'; $config['sess_expiration'] = 7200; $config['sess_encrypt_cookie'] = FALSE; -$config['sess_use_database'] = FALSE; -$config['sess_table_name'] = ''; +$config['sess_use_database'] = TRUE; +$config['sess_table_name'] = 'ci_sessions'; $config['sess_match_ip'] = TRUE; $config['sess_match_useragent'] = TRUE; diff --git a/system/application/config/database.php b/system/application/config/database.php index b3246b6ec..5cfd76347 100644 --- a/system/application/config/database.php +++ b/system/application/config/database.php @@ -36,13 +36,13 @@ $active_group = "default"; $db['default']['hostname'] = "localhost"; $db['default']['username'] = "root"; $db['default']['password'] = ""; -$db['default']['database'] = "tester"; +$db['default']['database'] = "test"; $db['default']['dbdriver'] = "mysql"; $db['default']['dbprefix'] = ""; $db['default']['active_r'] = TRUE; $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; -$db['default']['cache_on'] = TRUE; +$db['default']['cache_on'] = FALSE; $db['default']['cachedir'] = APPPATH.'dbcache/'; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 817b49bf1..593a1f2a8 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -33,7 +33,7 @@ window.onload = function() {
- +

Code Igniter User Guide Version 1.5.0b3

Code Igniter User Guide Version 1.5.0

@@ -63,7 +63,7 @@ Change Log

Change Log

-

Version 1.5.0 Beta 3

+

Version 1.5.0

Release Date: October 30, 2006