summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/codeigniter/CodeIgniter.php2
-rw-r--r--system/libraries/Loader.php10
2 files changed, 6 insertions, 6 deletions
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 49347715f..93c1dba5f 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -244,7 +244,7 @@ $EXT->_call_hook('post_system');
* Close the DB connection if one exists
* ------------------------------------------------------
*/
-if (class_exists('CI_DB'))
+if (class_exists('CI_DB') AND isset($CI->db))
{
$CI->db->close();
}
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 2d312e9eb..7bf11609b 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -70,7 +70,7 @@ class CI_Loader {
* @param mixed the optional parameters
* @return void
*/
- function library($class, $params = FALSE)
+ function library($class, $params = NULL)
{
if ($class == '')
return;
@@ -640,7 +640,7 @@ class CI_Loader {
* @param mixed any additional parameters
* @return void
*/
- function _ci_load_class($class, $params = FALSE)
+ function _ci_load_class($class, $params = NULL)
{
// Prep the class name
$class = strtolower(str_replace(EXT, '', $class));
@@ -700,12 +700,12 @@ class CI_Loader {
* @param string
* @return null
*/
- function _ci_init_class($class, $prefix = '', $config = FALSE)
+ function _ci_init_class($class, $prefix = '', $config = NULL)
{
// Is there an associated config file for this class?
- if ($config !== FALSE)
+ if ($config !== NULL)
{
- $config = FALSE;
+ $config = NULL;
if (file_exists(APPPATH.'config/'.$class.EXT))
{
include_once(APPPATH.'config/'.$class.EXT);