diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-09 23:53:12 +0200 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-09 23:53:12 +0200 |
commit | c8cbff7c6b380321418f377130e5e25cf4a6f524 (patch) | |
tree | 98611eed9f4ba07d847ed33628fe2a2cd5ff5592 /user_guide/changelog.html | |
parent | ef8005b5cda2f7acf930aa88b7380a36bd06721b (diff) | |
parent | 8fdda7907446db9ae2b9096a7caf361d4af98ce6 (diff) |
Merged conflict.
Diffstat (limited to 'user_guide/changelog.html')
-rw-r--r-- | user_guide/changelog.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 62321079f..4cf40a153 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -92,6 +92,7 @@ Change Log <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> + <li class="reactor">Added support to set an optional parameter in your callback rules of validation using the <a href="libraries/form_validation.html">Form Validation library</a>.</li> </ul> </li> </ul> |