From 49439ff0a4deaac47e078c137216b0c410bd6ec4 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Oct 2006 04:39:12 +0000 Subject: --- system/application/config/config.php | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'system/application/config') diff --git a/system/application/config/config.php b/system/application/config/config.php index fc4724010..3c3b423dc 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -142,20 +142,6 @@ $config['enable_query_strings'] = FALSE; $config['controller_trigger'] = 'c'; $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 @@ -163,10 +149,8 @@ $config['time_reference'] = 'local'; | | 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 @@ -302,4 +286,17 @@ $config['compress_output'] = FALSE; $config['time_reference'] = 'local'; +/* +|-------------------------------------------------------------------------- +| Rewrite PHP Short Tags +|-------------------------------------------------------------------------- +| +| If your PHP installation does not have short tag support enabled CI +| can rewrite the tags on-the-fly, enabling you to utilize that syntax +| in your view files. Options are TRUE or FALSE (boolean) +| +*/ +$config['rewrite_short_tags'] = FALSE; + + ?> \ No newline at end of file -- cgit v1.2.3-24-g4f1b