diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:56:50 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:56:50 +0200 |
| commit | 37f4b9caa02783e06dd7c5318200113409a0deb1 (patch) | |
| tree | 314bd87831a09913cbbfd1ffe1447b3c38b394c5 /system/database/DB.php | |
| parent | 114ab0988e20ac6be39ad363ff897a1a3b85e565 (diff) | |
backed out 648b42a75739, which was a NON-trivial whitespace commit. It broke the Typography class's string replacements, for instance
Diffstat (limited to 'system/database/DB.php')
| -rw-r--r-- | system/database/DB.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index 4481cef63..33207d885 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * @@ -35,7 +35,7 @@ function &DB($params = '', $active_record_override = NULL) show_error('The configuration file database.php does not exist.'); } } - + include($file_path); if ( ! isset($db) OR count($db) == 0) @@ -59,10 +59,10 @@ function &DB($params = '', $active_record_override = NULL) { /* parse the URL from the DSN string - * Database settings can be passed as discreet - * parameters or as a data source name in the first - * parameter. DSNs must have this prototype: - * $dsn = 'driver://username:password@hostname/database'; + * Database settings can be passed as discreet + * parameters or as a data source name in the first + * parameter. DSNs must have this prototype: + * $dsn = 'driver://username:password@hostname/database'; */ if (($dns = @parse_url($params)) === FALSE) @@ -100,13 +100,13 @@ function &DB($params = '', $active_record_override = NULL) } } - // No DB specified yet? Beat them senseless... + // No DB specified yet? Beat them senseless... if ( ! isset($params['dbdriver']) OR $params['dbdriver'] == '') { show_error('You have not selected a database type to connect to.'); } - // Load the DB classes. Note: Since the active record class is optional + // Load the DB classes. Note: Since the active record class is optional // we need to dynamically create a class that extends proper parent class // based on whether we're using the active record class or not. // Kudos to Paul for discovering this clever use of eval() |