summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-24 10:56:52 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-24 10:56:52 +0100
commit99cfa80a4d637892930505650c3f6cf74ae3a300 (patch)
tree13f9a9ad2c8f2e92fcb21f34b60cf364eee47d88 /system/helpers
parentc4fcb6ac466173696f765d3c7ca16b823d2cb04e (diff)
parent5148029aaf204fb3e7e4f24a794bee781d0c218b (diff)
Merge upstream branch
Diffstat (limited to 'system/helpers')
-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);
}
}