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
diff --git a/system/database/DB.php b/system/database/DB.php
index d603805..2446645 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 @@
{
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 @@
$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 @@
}
// 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 @@
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 @@
}
-
-/* End of file DB.php */
+
+/* End of file DB.php */
/* Location: ./system/database/DB.php */
\ No newline at end of file