summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-28 13:48:55 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-28 13:48:55 +0100
commit575bbfe97e4f0e3ad88558454fb2c87d372a7651 (patch)
treeeec271f209f8a7539b3b519be3a68e067f24562a /system/helpers
parentd33e24c2a649420d420ad9b11efb1bbf2421114c (diff)
parent0aa8c60ae7eee0122c42ae17d42fd5471a575743 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-sqlite
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);
}
}