summaryrefslogtreecommitdiffstats
path: root/system/helpers/inflector_helper.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-02-16 18:47:11 +0100
committerTimothy Warren <tim@timshomepage.net>2012-02-16 18:47:11 +0100
commit9fcb7b64e519e17b3839b9598c598c431c4ed04a (patch)
treef663f16d5d73cbede2e05486d7d486e9052a921f /system/helpers/inflector_helper.php
parente27216f88443775534e185e192996353d4958387 (diff)
parent827a92a6965612b185ae2e6766b6fb7740cd0cc2 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird
Diffstat (limited to 'system/helpers/inflector_helper.php')
-rw-r--r--system/helpers/inflector_helper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 0bd1e112f..2069a1927 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -85,7 +85,7 @@ if ( ! function_exists('singular'))
'/([^u])s$/' => '\1',
);
- return preg_replace(array_keys($singular_values), $singular_values, $result);
+ return preg_replace(array_keys($singular_rules), $singular_rules, $result);
}
}