diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2008-08-31 16:31:08 +0200 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2008-08-31 16:31:08 +0200 |
| commit | 0134ca4d6be32009c7fb7d40cfdbd31e19b970c3 (patch) | |
| tree | 456dcc127a03d5bd2f96c5ec33c0263b18354319 /user_guide | |
| parent | cb36e34719bf60904bc7fa39dfbcb0fa86310e66 (diff) | |
fixed incorrect example SQL output example
Diffstat (limited to 'user_guide')
| -rw-r--r-- | user_guide/changelog.html | 2 | ||||
| -rw-r--r-- | user_guide/database/active_record.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 50a3bc78e..a54548ed5 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -96,7 +96,7 @@ SVN Revision: XXXX</p> <h3>Bug fixes for 1.7.0</h3>
<ul>
<li>Fixed bug in xss_clean() that could remove some desirable tag attributes.</li>
- <li>Fixed assorted user guide typos or examples (#4807, #4840, #4862, #4864, #4899, #4930, #5006, #5071).</li>
+ <li>Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071).</li>
<li>Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.</li>
<li>Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.</li>
<li>Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.</li>
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 3a40dc2ce..04e81d8cc 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -228,7 +228,7 @@ $this->db->join('comments', 'comments.id = blogs.id', <strong>'left'</strong>);< <code>$this->db->where('name', $name);<br />
$this->db->where('title', $title);<br />
$this->db->where('status', $status);
- <br /><br />// WHERE = name 'Joe' AND title = 'boss' AND status = 'active' </code> </li>
+ <br /><br />// WHERE name 'Joe' AND title = 'boss' AND status = 'active' </code> </li>
<li><strong>Custom key/value method:</strong>
|