diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-29 16:50:09 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-29 16:50:09 +0200 |
| commit | 70e61b5dc0b240c4a3341ca65ad9f2f5254df1b5 (patch) | |
| tree | a0970957a17eeaa0e31e501d5ce537023b846110 /user_guide | |
| parent | 4c907236af3b6dc11a7b4989ece1c84a26483c46 (diff) | |
| parent | 4f17de94737f5eb9e1230f7d854dea611ebd9901 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'user_guide')
| -rw-r--r-- | user_guide/changelog.html | 1 | ||||
| -rw-r--r-- | user_guide/database/active_record.html | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 33e0a62c1..978b710be 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -65,6 +65,7 @@ Change Log <ul> <li>General Changes <ul> + <li class="reactor">Added Android to the list of user agents.</li> <li class="reactor">Callback validation rules can now accept parameters like any other validation rule.</li> <li class="reactor">Ability to log certain error types, not all under a threshold.</li> <li class="reactor">Added html_escape() to <a href="general/common_functions.html">Common functions</a> to escape HTML output for preventing XSS.</li> diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 92d9614d5..0f09e78c3 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -79,9 +79,6 @@ is generated by each database adapter. It also allows for safer queries, since <p>The following functions allow you to build SQL <strong>SELECT</strong> statements.</p> -<p><strong>Note: If you are using PHP 5 you can use method chaining for more compact syntax. This is described at the end of the page.</strong></p> - - <h2>$this->db->get();</h2> <p>Runs the selection query and returns the result. Can be used by itself to retrieve all records from a table:</p> @@ -532,7 +529,7 @@ $this->db->insert('mytable', $object); <p>Generates an insert string based on the data you supply, and runs the query. You can either pass an <strong>array</strong> or an <strong>object</strong> to the function. Here is an example using an array:</p> -<code> +<code> $data = array(<br/> array(<br /> 'title' => 'My title' ,<br /> @@ -544,7 +541,7 @@ $data = array(<br/> 'name' => 'Another Name' ,<br /> 'date' => 'Another date'<br /> )<br/> -);<br /> +);<br /> <br /> $this->db->update_batch('mytable', $data); <br /><br /> |