diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2008-02-14 21:23:37 +0100 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2008-02-14 21:23:37 +0100 |
| commit | 63eac3eb96563336612c69452745190e8af3c813 (patch) | |
| tree | cbe9cd1d155687624ed819bbea713ecfb0d6acc3 | |
| parent | 9967ab4fdb3d6e358d44f063d2000ebf8b71b95a (diff) | |
little protection in case an array is provided as the $params for the DB class
| -rw-r--r-- | system/database/DB.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index c3e7722d3..16ca1c888 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -46,7 +46,7 @@ function &DB($params = '', $active_record_override = FALSE) $params = $db[$active_group];
}
- else
+ elseif (is_string($params))
{
/* parse the URL from the DSN string
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5f0c8fa2f..4d0e1c11d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,6 +66,7 @@ Change Log <h3>Bugfixes for 1.6.2</h3>
<ul>
<li>Fixed assorted user guide typos (#3453)</li>
+ <li>Fixed a bug in the DB class testing the $params argument</li>
</ul>
<h2>Version 1.6.1</h2>
<p>Release Date: February 12, 2008</p>
|