diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-09 23:00:37 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-09 23:00:37 +0200 |
| commit | ef8005b5cda2f7acf930aa88b7380a36bd06721b (patch) | |
| tree | 67e49ea7b06cf2b1ec03a283c617fb55d3dc5279 | |
| parent | ed9324264a4cea861abb98781f260ab170d2ac05 (diff) | |
| parent | 03fb8ddfb9a9ce827405c106863db5d4678a6636 (diff) | |
Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into develop
| -rw-r--r-- | system/database/DB_active_rec.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index bc11ff436..0a25b3cb5 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -790,7 +790,7 @@ class CI_DB_active_record extends CI_DB_driver { if ($v != '') { - $v = ' '.$this->escape_str($v); + $v = ' '.$this->escape($v); } $this->ar_having[] = $prefix.$k.$v; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index fe5a67dde..62321079f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -91,6 +91,7 @@ Change Log <li class="reactor">Added <kbd>$this->db->set_dbprefix()</kbd> to the <a href="database/queries.html">Database Driver</a>.</li> <li class="reactor">Changed <kbd>$this->cart->insert()</kbd> in the <a href="libraries/cart.html">Cart Library</a> to return the Row ID if a single item was inserted successfully.</li> <li class="reactor">Added <kbd>$this->load->get_var()</kbd> to the <a href="libraries/loader.html">Loader library</a> to retrieve global vars set with <kbd>$this->load->view()</kbd> and <kbd>$this->load->vars()</kbd>.</li> + <li>Changed <kbd>$this->db->having()</kbd> to insert quotes using escape() rather than escape_str().</li> </ul> </li> </ul> |