diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index e64e008..d7018bf 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -235,7 +235,7 @@
$out = '';
// First generate the headings from the table column names
- foreach ($query->field_names() as $name)
+ foreach ($query->list_fields() as $name)
{
$out .= $name.$delim;
}
diff --git a/system/language/english/unit_test_lang.php b/system/language/english/unit_test_lang.php
index b64ea6d..33b20c5 100644
--- a/system/language/english/unit_test_lang.php
+++ b/system/language/english/unit_test_lang.php
@@ -11,8 +11,8 @@
$lang['ut_failed'] = 'Failed';
$lang['ut_boolean'] = 'Boolean';
$lang['ut_integer'] = 'Integer';
-$lang['ut_double'] = 'Float';
-$lang['ut_float'] = 'Floag';
+$lang['ut_float'] = 'Float';
+$lang['ut_double'] = 'Float'; // can be the same as float
$lang['ut_string'] = 'String';
$lang['ut_array'] = 'Array';
$lang['ut_object'] = 'Object';
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 17a441c..d4d1b2f 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -319,16 +319,6 @@
{
return $path;
}
-
- // OK, how about REQUEST_URI?
- // Note: REQUEST_URI is not supplied in a consistent manner with all platforms so it's
- // a difficult variable to use. We'll try to parse it out correctly. Hopefully one
- // of the other variables above was available.
- $path = $this->_parse_request_uri();
- if ($path != "")
- {
- return $path;
- }
// We've exhausted all our options...
return '';
diff --git a/system/scaffolding/Scaffolding.php b/system/scaffolding/Scaffolding.php
index 60b608d..d42b568 100644
--- a/system/scaffolding/Scaffolding.php
+++ b/system/scaffolding/Scaffolding.php
@@ -154,7 +154,7 @@
$query = $this->CI->db->get($this->current_table, $per_page, $offset);
// Now let's get the field names
- $fields = $this->CI->db->field_names($this->current_table);
+ $fields = $this->CI->db->list_fields($this->current_table);
// We assume that the column in the first position is the primary field.
$primary = current($fields);
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index cc1c28d..db656bc 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -77,8 +77,8 @@
<li>Added <a href="./libraries/user_agent.html">User Agent Library</a> which allows browsers, robots, and mobile devises to be identified.</li>
<li>Added <a href="./libraries/table.html">HTML Table Class</a> , enabling tables to be generated from arrays or database results.</li>
<li>Added <a href="./libraries/Zip.html">Zip Encoding Library</a>.</li>
-<li>Added the ability to <a href="creating_libraries.html">extend libraries</a> and <a href="core_classes.html">extend core classes</a>, in addition to being able to replace them.</li>
-<li>Added support for storing <a href="models.html">models within sub-folders</a>.</li>
+<li>Added the ability to <a href="./general/creating_libraries.html">extend libraries</a> and <a href="./general/core_classes.html">extend core classes</a>, in addition to being able to replace them.</li>
+<li>Added support for storing <a href="./general/models.html">models within sub-folders</a>.</li>
<li>Added <a href="./helpers/download_helper.html">Download Helper</a>.</li>
<li>Added <a href="./database/queries.html">simple_query()</a> function to the database classes</li>
<li>Added <a href="./helpers/date_helper.html">standard_date()</a> function to the Date Helper.</li>