diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2008-05-13 06:22:33 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2008-05-13 06:22:33 +0200 |
| commit | 0b59f270a432f8c7b6128981f0a39b4a2e2fbd34 (patch) | |
| tree | 1e7655eabd76bb981692f5d4f21cb1fc7be3e9cd /system/database/DB.php | |
| parent | 5cf664748ee295867f593d7eb7991bd35fe8eca6 (diff) | |
Some sweeping syntax changes for consistency:
(! foo) changed to ( ! foo)
|| changed to OR
changed newline standardization code in various places from preg_replace to str_replace
Diffstat (limited to 'system/database/DB.php')
| -rw-r--r-- | system/database/DB.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index d603805a5..2446645a7 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
*
@@ -29,7 +29,7 @@ function &DB($params = '', $active_record_override = FALSE) {
include(APPPATH.'config/database'.EXT);
- if (! isset($db) OR count($db) == 0)
+ if ( ! isset($db) OR count($db) == 0)
{
show_error('No database connection settings were found in the database config file.');
}
@@ -39,7 +39,7 @@ function &DB($params = '', $active_record_override = FALSE) $active_group = $params;
}
- if (! isset($active_group) OR ! isset($db[$active_group]))
+ if ( ! isset($active_group) OR ! isset($db[$active_group]))
{
show_error('You have specified an invalid database connection group.');
}
@@ -71,7 +71,7 @@ function &DB($params = '', $active_record_override = FALSE) }
// No DB specified yet? Beat them senseless...
- if (! isset($params['dbdriver']) OR $params['dbdriver'] == '')
+ if ( ! isset($params['dbdriver']) OR $params['dbdriver'] == '')
{
show_error('You have not selected a database type to connect to.');
}
@@ -88,18 +88,18 @@ function &DB($params = '', $active_record_override = FALSE) require_once(BASEPATH.'database/DB_driver'.EXT);
- if (! isset($active_record) OR $active_record == TRUE)
+ if ( ! isset($active_record) OR $active_record == TRUE)
{
require_once(BASEPATH.'database/DB_active_rec'.EXT);
- if (! class_exists('CI_DB'))
+ if ( ! class_exists('CI_DB'))
{
eval('class CI_DB extends CI_DB_active_record { }');
}
}
else
{
- if (! class_exists('CI_DB'))
+ if ( ! class_exists('CI_DB'))
{
eval('class CI_DB extends CI_DB_driver { }');
}
@@ -120,6 +120,6 @@ function &DB($params = '', $active_record_override = FALSE) }
- -/* End of file DB.php */ +
+/* End of file DB.php */
/* Location: ./system/database/DB.php */
\ No newline at end of file |