summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-05-24 18:31:39 +0200
committerAndrey Andreev <narf@bofh.bg>2012-05-24 18:31:39 +0200
commitd45f9503a45e099ed35df3e83aaa12bd91217dea (patch)
treee33f3016ddd5e04b5b8a2dec2beb052943aa11bd /system
parent7f57a016358a5ae19470d6c45b09d647246e3462 (diff)
Add backwards compatibility work-around for the configuration setting
Diffstat (limited to 'system')
-rwxr-xr-xsystem/database/DB.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/system/database/DB.php b/system/database/DB.php
index 9b96c7fcd..1fe44c0e5 100755
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -118,6 +118,13 @@ function &DB($params = '', $query_builder_override = NULL)
{
$query_builder = $query_builder_override;
}
+ // Backwards compatibility work-around for keeping the
+ // $active_record config variable working. Should be
+ // removed in v3.1
+ elseif ( ! isset($query_builder) && isset($active_record))
+ {
+ $query_builder = $active_record;
+ }
require_once(BASEPATH.'database/DB_driver.php');