summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_utility.php2
-rw-r--r--system/language/english/unit_test_lang.php4
-rw-r--r--system/libraries/Router.php10
-rw-r--r--system/scaffolding/Scaffolding.php2
4 files changed, 4 insertions, 14 deletions
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index e64e008bc..d7018bf2b 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -235,7 +235,7 @@ class CI_DB_utility {
$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 b64ea6de9..33b20c567 100644
--- a/system/language/english/unit_test_lang.php
+++ b/system/language/english/unit_test_lang.php
@@ -11,8 +11,8 @@ $lang['ut_passed'] = 'Passed';
$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 17a441c77..d4d1b2fdb 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -319,16 +319,6 @@ class CI_Router {
{
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 60b608d6c..d42b56863 100644
--- a/system/scaffolding/Scaffolding.php
+++ b/system/scaffolding/Scaffolding.php
@@ -154,7 +154,7 @@ class Scaffolding {
$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);