diff --git a/system/application/errors/error_php.php b/system/application/errors/error_php.php
index 9bba5b8..f085c20 100644
--- a/system/application/errors/error_php.php
+++ b/system/application/errors/error_php.php
@@ -7,4 +7,4 @@
<p>Filename: <?php echo $filepath; ?></p>
<p>Line Number: <?php echo $line; ?></p>
-</div>
+</div>
\ No newline at end of file
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index b1feee8..922382a 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -32,8 +32,6 @@
var $_ci_scaffolding = FALSE;
var $_ci_scaff_table = FALSE;
-
-
/**
* Constructor
*
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index aaeee7f..7c42123 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -181,8 +181,17 @@
return DB($params, $active_record);
}
+ // Grab the super object
$CI =& get_instance();
- $CI->db =& DB($params, $active_record);
+
+ // Initialize the db variable. Needed to prevent
+ // reference errors with some configurations
+ $CI->db = '';
+
+ // Load the DB class
+ $CI->db =& DB($params, $active_record);
+
+ // Assign the DB object to any existing models
$this->_ci_assign_to_models();
}
@@ -828,11 +837,6 @@
*/
function _ci_assign_to_models()
{
- if (count($this->_ci_models) == 0)
- {
- return;
- }
-
if ($this->_ci_is_instance())
{
$CI =& get_instance();