summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-16 10:44:48 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-16 10:44:48 +0100
commita286c8a837422b5f582c3c391dc2805a500b1532 (patch)
tree137343e2c3f69510fef106b0a8148bddf5f71fe0 /system/helpers
parentdddf7189ea0ed0855d43c4090ffe0c7577ec7dc5 (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);
}
}