summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/changelog.html2
-rw-r--r--user_guide/general/models.html12
-rw-r--r--user_guide/libraries/config.html2
3 files changed, 9 insertions, 7 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 5740f7397..fb533b082 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -184,6 +184,8 @@ Hg Tag: </p>
<li>Fixed a bug where getimagesize() was being needlessly checked on non-image files in is_allowed_type().</li>
<li>Fixed a bug in the Encryption library where an empty key was not triggering an error.</li>
<li>Fixed a bug in the Email library where CC and BCC recipients were not reset when using the clear() method (#109).</li>
+ <li>Fixed a bug in the URL Helper where prep_url() could cause a PHP error on PHP versions &lt; 5.1.2.</li>
+ <li>Added a log message in core/output if the cache directory config value was not found.</li>
</ul>
<h2>Version 1.7.2</h2>
diff --git a/user_guide/general/models.html b/user_guide/general/models.html
index e04fdf996..e405dd1b6 100644
--- a/user_guide/general/models.html
+++ b/user_guide/general/models.html
@@ -77,7 +77,7 @@ you use CodeIgniter to manage a blog. You might have a model class that contain
retrieve your blog data. Here is an example of what such a model class might look like:</p>
<code>
-class&nbsp;Blogmodel&nbsp;extends&nbsp;Model&nbsp;{<br />
+class&nbsp;Blogmodel&nbsp;extends&nbsp;CI_Model&nbsp;{<br />
<br />
&nbsp;&nbsp;&nbsp;&nbsp;var $title&nbsp;&nbsp; = '';<br />
&nbsp;&nbsp;&nbsp;&nbsp;var $content = '';<br />
@@ -86,7 +86,7 @@ class&nbsp;Blogmodel&nbsp;extends&nbsp;Model&nbsp;{<br />
&nbsp;&nbsp;&nbsp;&nbsp;function&nbsp;Blogmodel()<br />
&nbsp;&nbsp;&nbsp;&nbsp;{<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;// Call the Model constructor<br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parent::Model();<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parent::CI_Model();<br />
&nbsp;&nbsp;&nbsp;&nbsp;}<br />
&nbsp;&nbsp;&nbsp;&nbsp;<br />
&nbsp;&nbsp;&nbsp;&nbsp;function&nbsp;get_last_ten_entries()<br />
@@ -126,11 +126,11 @@ want this type of organization.</p>
<code>
-class&nbsp;<var>Model_name</var>&nbsp;extends&nbsp;Model&nbsp;{<br />
+class&nbsp;<var>Model_name</var>&nbsp;extends&nbsp;CI_Model&nbsp;{<br />
<br />
&nbsp;&nbsp;&nbsp;&nbsp;function&nbsp;<var>Model_name</var>()<br />
&nbsp;&nbsp;&nbsp;&nbsp;{<br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parent::Model();<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parent::CI_Model();<br />
&nbsp;&nbsp;&nbsp;&nbsp;}<br />
}</code>
@@ -140,11 +140,11 @@ Make sure your class extends the base Model class.</p>
<p>The file name will be a lower case version of your class name. For example, if your class is this:</p>
<code>
-class&nbsp;<var>User_model</var>&nbsp;extends&nbsp;Model&nbsp;{<br />
+class&nbsp;<var>User_model</var>&nbsp;extends&nbsp;CI_Model&nbsp;{<br />
<br />
&nbsp;&nbsp;&nbsp;&nbsp;function&nbsp;<var>User_model</var>()<br />
&nbsp;&nbsp;&nbsp;&nbsp;{<br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parent::Model();<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;parent::CI_Model();<br />
&nbsp;&nbsp;&nbsp;&nbsp;}<br />
}</code>
diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html
index 6367e2e8e..bfb679457 100644
--- a/user_guide/libraries/config.html
+++ b/user_guide/libraries/config.html
@@ -66,7 +66,7 @@ come from the default config file (<samp>application/config/config.php</samp>) o
<h2>Anatomy of a Config File</h2>
-<p>By default, CodeIgniter has a one primary config file, located at <samp>application/config/config.php</samp>. If you open the file using
+<p>By default, CodeIgniter has one primary config file, located at <samp>application/config/config.php</samp>. If you open the file using
your text editor you'll see that config items are stored in an array called <var>$config</var>.</p>
<p>You can add your own config items to