diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-27 22:53:25 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-27 22:53:25 +0200 |
| commit | 2d8707f8ba27f16a226d85a011aeab5325b27100 (patch) | |
| tree | f94af6e8b63a8632c45965c2f907a1abd76c6436 /system/database/DB.php | |
| parent | f777d3ddafcd2a79bbc65d329e1f9586c3a449fb (diff) | |
| parent | 11fd4b8759438f216318e3e1e004f918b88a56ad (diff) | |
Merge branch 'develop' of 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 |