summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2009-05-03 21:45:45 +0200
committerDerek Allard <derek.allard@ellislab.com>2009-05-03 21:45:45 +0200
commit03d783ba0bbee1a5f76b6ad686bbcee59a2e21fb (patch)
tree8ad3eac53908504d85022a524708a9ff5ccaa4ea
parent58b339988cc1ad4516fea3c00b56a3660aac8225 (diff)
bug fix and typo fixes
-rw-r--r--system/database/DB_active_rec.php2
-rw-r--r--user_guide/changelog.html2
-rw-r--r--user_guide/general/models.html2
-rw-r--r--user_guide/libraries/form_validation.html2
4 files changed, 4 insertions, 4 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index d07255855..07021999f 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -1380,7 +1380,7 @@ class CI_DB_active_record extends CI_DB_driver {
$this->limit($limit);
}
- if (count($this->ar_where) == 0 && count($this->ar_wherein) == 0 && count($this->ar_like))
+ if (count($this->ar_where) == 0 && count($this->ar_wherein) == 0 && count($this->ar_like) == 0)
{
if ($this->db_debug)
{
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index db30ad4d1..c423ac6e7 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -88,7 +88,7 @@ SVN Revision: </p>
<h3>Bug fixes for 1.7.2</h3>
<ul>
- <li>Fixed assorted user guide typos or examples (#6743, #7214).</li>
+ <li>Fixed assorted user guide typos or examples (#6743, #7214, #7516, #7287).</li>
<li>doctype helper default value was missing a "1".</li>
<li>Fixed a bug with ORIG_PATH_INFO that was allowing URIs of just a slash through.</li>
<li>Fixed a fatal error in the Oracle and ODBC drivers (#6752)</li>
diff --git a/user_guide/general/models.html b/user_guide/general/models.html
index efee5117a..88600bc1f 100644
--- a/user_guide/general/models.html
+++ b/user_guide/general/models.html
@@ -161,7 +161,7 @@ To load a model you will use the following function:</p>
<code>$this->load->model('<var>Model_name</var>');</code>
-<p>If you model is located in a sub-folder, include the relative path from your models folder. For example, if
+<p>If your model is located in a sub-folder, include the relative path from your models folder. For example, if
you have a model located at <dfn>application/models/blog/queries.php</dfn> you'll load it using:</p>
<code>$this->load->model('<var>blog/queries</var>');</code>
diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html
index 3069054ae..c34798438 100644
--- a/user_guide/libraries/form_validation.html
+++ b/user_guide/libraries/form_validation.html
@@ -830,7 +830,7 @@ class <kbd>Member</kbd> extends Controller {<br />
<code>$config = array(<br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'<kbd>member/signup</kbd>' = array(<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'<kbd>member/signup</kbd>' => array(<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;array(<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'field' => 'username',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'label' => 'Username',<br />