summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/helpers/inflector_helper.php10
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 6 insertions, 5 deletions
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 72615671c..647d840e4 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -45,7 +45,7 @@ if ( ! function_exists('singular'))
* Takes a plural word and makes it singular
*
* @param string
- * @return str
+ * @return string
*/
function singular($str)
{
@@ -110,7 +110,7 @@ if ( ! function_exists('plural'))
*
* @param string
* @param bool
- * @return str
+ * @return string
*/
function plural($str, $force = FALSE)
{
@@ -166,7 +166,7 @@ if ( ! function_exists('camelize'))
* Takes multiple words separated by spaces or underscores and camelizes them
*
* @param string
- * @return str
+ * @return string
*/
function camelize($str)
{
@@ -184,7 +184,7 @@ if ( ! function_exists('underscore'))
* Takes multiple words separated by spaces and underscores them
*
* @param string
- * @return str
+ * @return string
*/
function underscore($str)
{
@@ -203,7 +203,7 @@ if ( ! function_exists('humanize'))
*
* @param string $str
* @param string $separator
- * @return str
+ * @return string
*/
function humanize($str, $separator = '_')
{
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d33a6a635..0066af9ad 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -52,6 +52,7 @@ Release Date: Not Released
- set_realpath() can now also handle file paths as opposed to just directories.
- do_hash() now uses PHP's native hash() function, supporting more algorithms.
- Added an optional paramater to ``delete_files()`` to enable it to skip deleting files such as .htaccess and index.html.
+ - Removed deprecated helper function ``js_insert_smiley`` from smiley helper.
- Database