summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorJamie Rumbelow <jamie@jamierumbelow.net>2012-02-19 13:37:00 +0100
committerJamie Rumbelow <jamie@jamierumbelow.net>2012-02-19 13:37:00 +0100
commit7efad20597ef7e06f8cf837a9f40918d2d3f2727 (patch)
tree0effaff70b6b01042975aab293a340383fbb70bf /system/core
parent7a2412cfe7f7d8db3eb845542609c476c52efc3d (diff)
Renaming Active Record to Query Builder across the system
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Loader.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 12daaa928..750e8cdd6 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -315,16 +315,16 @@ class CI_Loader {
*
* @param string the DB credentials
* @param bool whether to return the DB object
- * @param bool whether to enable active record (this allows us to override the config setting)
+ * @param bool whether to enable query builder (this allows us to override the config setting)
* @return object
*/
- public function database($params = '', $return = FALSE, $active_record = NULL)
+ public function database($params = '', $return = FALSE, $query_builder = NULL)
{
// Grab the super object
$CI =& get_instance();
// Do we even need to load the database class?
- if (class_exists('CI_DB') AND $return == FALSE AND $active_record == NULL AND isset($CI->db) AND is_object($CI->db))
+ if (class_exists('CI_DB') AND $return == FALSE AND $query_builder == NULL AND isset($CI->db) AND is_object($CI->db))
{
return FALSE;
}
@@ -333,7 +333,7 @@ class CI_Loader {
if ($return === TRUE)
{
- return DB($params, $active_record);
+ return DB($params, $query_builder);
}
// Initialize the db variable. Needed to prevent
@@ -341,7 +341,7 @@ class CI_Loader {
$CI->db = '';
// Load the DB class
- $CI->db =& DB($params, $active_record);
+ $CI->db =& DB($params, $query_builder);
}
// --------------------------------------------------------------------