diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-24 18:58:47 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-24 18:58:47 +0200 |
| commit | 0bf4e88d935e972fc432b8c3cdaeb5397749b580 (patch) | |
| tree | d19b5943d13b06393e118b460aac2ca8d37f8fc6 /user_guide | |
| parent | 10a4724f7a8113c5e23f113a37709c78406de7f2 (diff) | |
| parent | bc602d8b8e125597bfd557949e846ff5a258b858 (diff) | |
Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1-stable
Diffstat (limited to 'user_guide')
| -rw-r--r-- | user_guide/changelog.html | 3 | ||||
| -rw-r--r-- | user_guide/libraries/uri.html | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ca1a55bac..266ae8652 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -87,8 +87,9 @@ Change Log <li>Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found.</li> <li>Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.</li> <li>Fixed a bug (#726) - PDO put a 'dbname' argument in it's connection string regardless of the database platform in use, which made it impossible to use SQLite.</li> - <li>Fixed a bug - CI_DB_pdo_driver::affect_row was not being initialized properly with SELECT queries, cause it was relying on PDOStatement::rowCount().</li> <li>Fixed a bug - CI_DB_pdo_result::num_rows() was not returning properly value with SELECT queries, cause it was relying on PDOStatement::rowCount().</li> + <li>Fixed a bug (#1059) - CI_Image_lib::clear() was not correctly clearing all necessary object properties, namely width and height.</li> + <li>Fixed a bug (#1387) - Active Record's <samp>from()</samp> method didn't escape table aliases.</li> </ul> diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index f04bb9f10..663fca5bc 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -191,7 +191,7 @@ $str = $this->uri->assoc_to_uri($array);<br /> <p>The function would return this:</p> -<code>/news/local/345</code> +<code>news/local/345</code> <h2>$this->uri->ruri_string()</h2> |