diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 23:15:36 +0200 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 23:15:36 +0200 |
commit | ba4636187a745a287c81517fbc53f2f30fe16d88 (patch) | |
tree | bdcb56cc80e72735d0118f3abf91e04f0dfba5cd /user_guide_src/source/tutorial/news_section.rst | |
parent | cdfbd5281e4dec7278a07943832c2590c1141eb3 (diff) | |
parent | f3b0074b0ccaadef31737cbd6be21ec7272f7538 (diff) |
Fixed conflicts.
Diffstat (limited to 'user_guide_src/source/tutorial/news_section.rst')
-rw-r--r-- | user_guide_src/source/tutorial/news_section.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst index 38e4214ca..82b3e3b38 100644 --- a/user_guide_src/source/tutorial/news_section.rst +++ b/user_guide_src/source/tutorial/news_section.rst @@ -54,7 +54,7 @@ seed records. Now that the database and a model have been set up, you'll need a method to get all of our posts from our database. To do this, the database abstraction layer that is included with CodeIgniter — `Active -Record <../database/active_record.html>`_ — is used. This makes it +Record <../database/query_builder.html>`_ — is used. This makes it possible to write your 'queries' once and make them work on `all supported database systems <../general/requirements.html>`_. Add the following code to your model. @@ -76,7 +76,7 @@ following code to your model. With this code you can perform two different queries. You can get all news records, or get a news item by its `slug <#>`_. You might have noticed that the $slug variable wasn't sanitized before running the -query; Active Record does this for you. +query; Query Builder does this for you. Display the news ---------------- |