diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-06 20:21:13 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-06 20:21:13 +0200 |
| commit | 8e286e96af6f0487e9339d5d87c35a539a6879c6 (patch) | |
| tree | 8e089bcb41f1d7cd81d2f1a9afe77ddd998e0ff9 /application/config/database.php | |
| parent | 98350a59e21a7f5d38664a59170de91771c99a4b (diff) | |
| parent | ea09a8a5552f2aacdeab0c88a605fe44047ebd0a (diff) | |
Merge upstream branch
Diffstat (limited to 'application/config/database.php')
| -rw-r--r-- | application/config/database.php | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/application/config/database.php b/application/config/database.php index 154638d1f..8c06dd2e6 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -1,13 +1,13 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Academic Free License version 3.0 - * + * * This source file is subject to the Academic Free License (AFL 3.0) that is * bundled with this package in the files license_afl.txt / license_afl.rst. * It is also available through the world wide web at this URL: @@ -75,23 +75,25 @@ $active_group = 'default'; $active_record = TRUE; -$db['default']['dsn'] = ''; -$db['default']['hostname'] = 'localhost'; -$db['default']['username'] = ''; -$db['default']['password'] = ''; -$db['default']['database'] = ''; -$db['default']['dbdriver'] = 'mysql'; -$db['default']['dbprefix'] = ''; -$db['default']['pconnect'] = FALSE; -$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'] = array( + 'dsn' => '', + 'hostname' => 'localhost', + 'username' => '', + 'password' => '', + 'database' => '', + 'dbdriver' => 'mysqli', + 'dbprefix' => '', + 'pconnect' => FALSE, + 'db_debug' => TRUE, + 'cache_on' => FALSE, + 'cachedir' => '', + 'char_set' => 'utf8', + 'dbcollat' => 'utf8_general_ci', + 'swap_pre' => '', + 'autoinit' => TRUE, + 'stricton' => FALSE, + 'failover' => array() +); /* End of file database.php */ /* Location: ./application/config/database.php */
\ No newline at end of file |