summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-16 10:46:45 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-16 10:46:45 +0100
commit168e918a43ff07b0ac887e0ddc95a76c9cd57c8c (patch)
tree409f8afaf9ffb3fe109109753180dc3fa6b72f68 /system/helpers
parentbb8a68344931fc4621b8c3a173a7dcd572890fd8 (diff)
parent827a92a6965612b185ae2e6766b6fb7740cd0cc2 (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);
}
}