summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-05-06 04:44:37 +0200
committerDerek Allard <derek.allard@ellislab.com>2008-05-06 04:44:37 +0200
commit2f41936b5e565e89286edf734f49ef7d3e72586b (patch)
treec2c4b0aa2acd921eeff3678ff634f5c18877aec8
parentbe8ec803cf8542acca9d2dd24c46b219fecabd9c (diff)
Fixed an incorrect documentation of $this->load->language (#3520).
-rw-r--r--user_guide/changelog.html1
-rw-r--r--user_guide/libraries/loader.html2
2 files changed, 2 insertions, 1 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index de47d4785..181ccd1e7 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -108,6 +108,7 @@ SVN Commit: not currently released</p>
<h3>Bugfixes for 1.6.2</h3>
<ul>
<li>Fixed assorted user guide typos (#3453, #4364, #4379, #4399, #4408, #4412, #4448, #4488).</li>
+ <li>Fixed an incorrect documentation of $this-&gt;load-&gt;language (#3520).</li>
<li>Fixed an AR_caching error where it wasn't tracking table aliases (#3463).</li>
<li>Fixed an AR bug when joining with a table alias and table prefix (#4400).</li>
<li>Fixed a bug in DB Forge, when inserting an id field (#3456).</li>
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index 56fe8f5d2..04e496640 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -139,7 +139,7 @@ By default the data is sent to your browser, just like a View file, but if you s
it will instead return the data as a string.</p>
-<h2>$this->load->lang('<var>file_name</var>')</h2>
+<h2>$this->load->language('<var>file_name</var>')</h2>
<p>This function is an alias of the <a href="language.html">language loading function</a>: $this->lang->load()</p>
<h2>$this->load->config('<var>file_name</var>')</h2>