diff options
| author | Root <development@fractureme.com> | 2012-05-26 00:52:59 +0200 |
|---|---|---|
| committer | Root <development@fractureme.com> | 2012-05-26 00:52:59 +0200 |
| commit | 99e602d25051ed449255fe16c4aa0aadd7d05c1f (patch) | |
| tree | a0a9d0cdf4e741fcff68a2ecd70c198a43b5d787 /system/database/DB.php | |
| parent | 35ac46d4aad12fe723229feca403b4dee3efcc27 (diff) | |
| parent | f33e2ff30b0a9c54d6e8adbe88662838b9bd525e (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/DB.php')
| -rwxr-xr-x | system/database/DB.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index b28439b29..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'); @@ -159,4 +166,4 @@ function &DB($params = '', $query_builder_override = NULL) } /* End of file DB.php */ -/* Location: ./system/database/DB.php */ +/* Location: ./system/database/DB.php */
\ No newline at end of file |