From 5b179b55d389282e5097451e6b6a707baee0522c Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Wed, 20 Sep 2006 23:44:53 +0000
Subject:

---
 system/helpers/inflector_helper.php | 140 ++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 system/helpers/inflector_helper.php

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
new file mode 100644
index 000000000..3bded708e
--- /dev/null
+++ b/system/helpers/inflector_helper.php
@@ -0,0 +1,140 @@
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Code Igniter
+ *
+ * An open source application development framework for PHP 4.3.2 or newer
+ *
+ * @package		CodeIgniter
+ * @author		Rick Ellis
+ * @copyright	Copyright (c) 2006, pMachine, Inc.
+ * @license		http://www.codeignitor.com/user_guide/license.html 
+ * @link		http://www.codeigniter.com
+ * @since		Version 1.0
+ * @filesource
+ */
+ 
+// ------------------------------------------------------------------------
+
+/**
+ * Code Igniter Inflector Helpers
+ *
+ * @package		CodeIgniter
+ * @subpackage	Helpers
+ * @category	Helpers
+ * @author		Rick Ellis
+ * @link		http://www.codeigniter.com/user_guide/helpers/directory_helper.html
+ */
+
+
+// --------------------------------------------------------------------
+
+/**
+ * Singular
+ *
+ * Takes a plural word and makes it singular
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */		
+function singular($str)
+{
+	$str = strtolower(trim($str));
+	$end = substr($str, -3);
+	
+	if ($end == 'ies')
+	{
+		$str = substr($str, 0, strlen($str)-3).'y';
+	}
+	else
+	{
+		$end = substr($str, -1);
+		
+		if ($end == 's')
+		{
+			$str = substr($str, 0, strlen($str)-1);
+		}
+	}
+	
+	return $str;
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Plural
+ *
+ * Takes a singular word and makes it plural
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */		
+function plural($str)
+{
+	$str = strtolower(trim($str));
+	$end = substr($str, -1);
+
+	if ($end == 'y')
+	{
+		$str = substr($str, 0, strlen($str)-1).'ies';
+	}
+	elseif ($end != 's')
+	{
+		$str .= 's';
+	}
+
+	return $str;	
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Camelize
+ *
+ * Takes multiple words separated by spaces or underscores and camelizes them
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */		
+function camelize($str)
+{		
+	$str = 'x'.strtolower(trim($str));
+	$str = ucwords(preg_replace('/[\s_]+/', ' ', $str));
+	return substr(str_replace(' ', '', $str), 1);
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Underscore
+ *
+ * Takes multiple words separated by spaces and underscores them
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */		
+function underscore($str)
+{
+	return preg_replace('/[\s]+/', '_', strtolower(trim($str)));
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Humanize
+ *
+ * Takes multiple words separated by underscores and changes them to spaces
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */		
+function humanize($str)
+{
+	return ucwords(preg_replace('/[_]+/', ' ', strtolower(trim($str))));
+}
+	
+?>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 592cdcbc58963f0cf811aea59db9907943460770 Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Fri, 22 Sep 2006 18:45:42 +0000
Subject:

---
 system/helpers/inflector_helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 3bded708e..3d8d3e0ca 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -31,7 +31,7 @@
 /**
  * Singular
  *
- * Takes a plural word and makes it singular
+ * Takes a singular word and makes it plural
  *
  * @access	public
  * @param	string
@@ -64,7 +64,7 @@ function singular($str)
 /**
  * Plural
  *
- * Takes a singular word and makes it plural
+ * Takes a plural word and makes it singular
  *
  * @access	public
  * @param	string
-- 
cgit v1.2.3-24-g4f1b


From e334c472fb4be44feec3a73402fc4a2b062cbfc0 Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Sat, 21 Oct 2006 19:44:22 +0000
Subject:

---
 system/helpers/inflector_helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 3d8d3e0ca..666ec40b8 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -7,12 +7,12 @@
  * @package		CodeIgniter
  * @author		Rick Ellis
  * @copyright	Copyright (c) 2006, pMachine, Inc.
- * @license		http://www.codeignitor.com/user_guide/license.html 
+ * @license		http://www.codeignitor.com/user_guide/license.html
  * @link		http://www.codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
- 
+
 // ------------------------------------------------------------------------
 
 /**
-- 
cgit v1.2.3-24-g4f1b


From d2df9bc7cc9d4b3e53818470c5d0977c9a36677c Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Sun, 15 Apr 2007 17:41:17 +0000
Subject: update pMachine to EllisLab update copyright year update Code Igniter
 to CodeIgniter

---
 system/helpers/inflector_helper.php | 278 ++++++++++++++++++------------------
 1 file changed, 139 insertions(+), 139 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 666ec40b8..fbe851f3b 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -1,140 +1,140 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
-/**
- * Code Igniter
- *
- * An open source application development framework for PHP 4.3.2 or newer
- *
- * @package		CodeIgniter
- * @author		Rick Ellis
- * @copyright	Copyright (c) 2006, pMachine, Inc.
- * @license		http://www.codeignitor.com/user_guide/license.html
- * @link		http://www.codeigniter.com
- * @since		Version 1.0
- * @filesource
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * Code Igniter Inflector Helpers
- *
- * @package		CodeIgniter
- * @subpackage	Helpers
- * @category	Helpers
- * @author		Rick Ellis
- * @link		http://www.codeigniter.com/user_guide/helpers/directory_helper.html
- */
-
-
-// --------------------------------------------------------------------
-
-/**
- * Singular
- *
- * Takes a singular word and makes it plural
- *
- * @access	public
- * @param	string
- * @return	str
- */		
-function singular($str)
-{
-	$str = strtolower(trim($str));
-	$end = substr($str, -3);
-	
-	if ($end == 'ies')
-	{
-		$str = substr($str, 0, strlen($str)-3).'y';
-	}
-	else
-	{
-		$end = substr($str, -1);
-		
-		if ($end == 's')
-		{
-			$str = substr($str, 0, strlen($str)-1);
-		}
-	}
-	
-	return $str;
-}
-
-// --------------------------------------------------------------------
-
-/**
- * Plural
- *
- * Takes a plural word and makes it singular
- *
- * @access	public
- * @param	string
- * @return	str
- */		
-function plural($str)
-{
-	$str = strtolower(trim($str));
-	$end = substr($str, -1);
-
-	if ($end == 'y')
-	{
-		$str = substr($str, 0, strlen($str)-1).'ies';
-	}
-	elseif ($end != 's')
-	{
-		$str .= 's';
-	}
-
-	return $str;	
-}
-
-// --------------------------------------------------------------------
-
-/**
- * Camelize
- *
- * Takes multiple words separated by spaces or underscores and camelizes them
- *
- * @access	public
- * @param	string
- * @return	str
- */		
-function camelize($str)
-{		
-	$str = 'x'.strtolower(trim($str));
-	$str = ucwords(preg_replace('/[\s_]+/', ' ', $str));
-	return substr(str_replace(' ', '', $str), 1);
-}
-
-// --------------------------------------------------------------------
-
-/**
- * Underscore
- *
- * Takes multiple words separated by spaces and underscores them
- *
- * @access	public
- * @param	string
- * @return	str
- */		
-function underscore($str)
-{
-	return preg_replace('/[\s]+/', '_', strtolower(trim($str)));
-}
-
-// --------------------------------------------------------------------
-
-/**
- * Humanize
- *
- * Takes multiple words separated by underscores and changes them to spaces
- *
- * @access	public
- * @param	string
- * @return	str
- */		
-function humanize($str)
-{
-	return ucwords(preg_replace('/[_]+/', ' ', strtolower(trim($str))));
-}
-	
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP 4.3.2 or newer
+ *
+ * @package		CodeIgniter
+ * @author		Rick Ellis
+ * @copyright	Copyright (c) 2006, EllisLab, Inc.
+ * @license		http://www.codeignitor.com/user_guide/license.html
+ * @link		http://www.codeigniter.com
+ * @since		Version 1.0
+ * @filesource
+ */
+
+// ------------------------------------------------------------------------
+
+/**
+ * CodeIgniter Inflector Helpers
+ *
+ * @package		CodeIgniter
+ * @subpackage	Helpers
+ * @category	Helpers
+ * @author		Rick Ellis
+ * @link		http://www.codeigniter.com/user_guide/helpers/directory_helper.html
+ */
+
+
+// --------------------------------------------------------------------
+
+/**
+ * Singular
+ *
+ * Takes a singular word and makes it plural
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */		
+function singular($str)
+{
+	$str = strtolower(trim($str));
+	$end = substr($str, -3);
+	
+	if ($end == 'ies')
+	{
+		$str = substr($str, 0, strlen($str)-3).'y';
+	}
+	else
+	{
+		$end = substr($str, -1);
+		
+		if ($end == 's')
+		{
+			$str = substr($str, 0, strlen($str)-1);
+		}
+	}
+	
+	return $str;
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Plural
+ *
+ * Takes a plural word and makes it singular
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */		
+function plural($str)
+{
+	$str = strtolower(trim($str));
+	$end = substr($str, -1);
+
+	if ($end == 'y')
+	{
+		$str = substr($str, 0, strlen($str)-1).'ies';
+	}
+	elseif ($end != 's')
+	{
+		$str .= 's';
+	}
+
+	return $str;	
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Camelize
+ *
+ * Takes multiple words separated by spaces or underscores and camelizes them
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */		
+function camelize($str)
+{		
+	$str = 'x'.strtolower(trim($str));
+	$str = ucwords(preg_replace('/[\s_]+/', ' ', $str));
+	return substr(str_replace(' ', '', $str), 1);
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Underscore
+ *
+ * Takes multiple words separated by spaces and underscores them
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */		
+function underscore($str)
+{
+	return preg_replace('/[\s]+/', '_', strtolower(trim($str)));
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Humanize
+ *
+ * Takes multiple words separated by underscores and changes them to spaces
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */		
+function humanize($str)
+{
+	return ucwords(preg_replace('/[_]+/', ' ', strtolower(trim($str))));
+}
+	
 ?>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From f5a519822db2201b98f822ad4f8659bad2ce9bcd Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Wed, 11 Jul 2007 19:35:09 +0000
Subject: inflector helper changes to account for words ending in "s"

---
 system/helpers/inflector_helper.php | 78 ++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 32 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index fbe851f3b..28ecf5201 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -39,26 +39,31 @@
  */		
 function singular($str)
 {
-	$str = strtolower(trim($str));
-	$end = substr($str, -3);
-	
-	if ($end == 'ies')
-	{
-		$str = substr($str, 0, strlen($str)-3).'y';
-	}
-	else
-	{
-		$end = substr($str, -1);
-		
-		if ($end == 's')
-		{
-			$str = substr($str, 0, strlen($str)-1);
-		}
-	}
-	
-	return $str;
+    $str = strtolower(trim($str));
+    $end = substr($str, -3);
+    
+    if ($end == 'ies')
+    {
+        $str = substr($str, 0, strlen($str)-3).'y';
+    }
+    elseif ($end == 'ses')
+    {
+        $str = substr($str, 0, strlen($str)-2);
+    }
+    else
+    {
+        $end = substr($str, -1);
+        
+        if ($end == 's')
+        {
+            $str = substr($str, 0, strlen($str)-1);
+        }
+    }
+    
+    return $str;
 }
 
+
 // --------------------------------------------------------------------
 
 /**
@@ -68,25 +73,34 @@ function singular($str)
  *
  * @access	public
  * @param	string
+ * @param	bool
  * @return	str
  */		
-function plural($str)
+function plural($str, $force = FALSE)
 {
-	$str = strtolower(trim($str));
-	$end = substr($str, -1);
-
-	if ($end == 'y')
-	{
-		$str = substr($str, 0, strlen($str)-1).'ies';
-	}
-	elseif ($end != 's')
-	{
-		$str .= 's';
-	}
-
-	return $str;	
+    $str = strtolower(trim($str));
+    $end = substr($str, -1);
+
+    if ($end == 'y')
+    {
+        $str = substr($str, 0, strlen($str)-1).'ies';
+    }
+    elseif ($end == 's')
+    {
+        if ($force == TRUE)
+        {
+            $str .= 'es';
+        }
+    }
+    else
+    {
+        $str .= 's';
+    }
+
+    return $str;
 }
 
+
 // --------------------------------------------------------------------
 
 /**
-- 
cgit v1.2.3-24-g4f1b


From eea2bdaaffcbee1a9efb56e60ae5712e30873f87 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Wed, 11 Jul 2007 22:09:45 +0000
Subject: fixed the plural() and singular() function comments

---
 system/helpers/inflector_helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 28ecf5201..49143913c 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -31,7 +31,7 @@
 /**
  * Singular
  *
- * Takes a singular word and makes it plural
+ * Takes a plural word and makes it singular
  *
  * @access	public
  * @param	string
@@ -69,7 +69,7 @@ function singular($str)
 /**
  * Plural
  *
- * Takes a plural word and makes it singular
+ * Takes a singular word and makes it plural
  *
  * @access	public
  * @param	string
-- 
cgit v1.2.3-24-g4f1b


From 6838f00a708f53f834fb8a98af560177db1d1454 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Thu, 4 Oct 2007 19:29:59 +0000
Subject: Fixed a typo in the docblock comments that had CodeIgniter spelled
 CodeIgnitor.

---
 system/helpers/inflector_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 49143913c..4202bd12c 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -7,7 +7,7 @@
  * @package		CodeIgniter
  * @author		Rick Ellis
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeignitor.com/user_guide/license.html
+ * @license		http://www.codeigniter.com/user_guide/license.html
  * @link		http://www.codeigniter.com
  * @since		Version 1.0
  * @filesource
-- 
cgit v1.2.3-24-g4f1b


From 3d879d529107c0c9d3f1e6b894d9ed17b6e6c54f Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Fri, 18 Jan 2008 19:41:32 +0000
Subject: ExpressionEngine Dev Team in credit

---
 system/helpers/inflector_helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 4202bd12c..a72d0cef7 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -5,7 +5,7 @@
  * An open source application development framework for PHP 4.3.2 or newer
  *
  * @package		CodeIgniter
- * @author		Rick Ellis
+ * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
  * @license		http://www.codeigniter.com/user_guide/license.html
  * @link		http://www.codeigniter.com
@@ -21,7 +21,7 @@
  * @package		CodeIgniter
  * @subpackage	Helpers
  * @category	Helpers
- * @author		Rick Ellis
+ * @author		ExpressionEngine Dev Team
  * @link		http://www.codeigniter.com/user_guide/helpers/directory_helper.html
  */
 
-- 
cgit v1.2.3-24-g4f1b


From 7a9193afa6d890a91eb3528fa0e62df799b07ed6 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Mon, 21 Jan 2008 18:39:20 +0000
Subject: replaced www.codeigniter.com with codeigniter.com

---
 system/helpers/inflector_helper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index a72d0cef7..b1864cb0b 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/directory_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/directory_helper.html
  */
 
 
-- 
cgit v1.2.3-24-g4f1b


From 269b942a2bf7b022795e591d9b0ad04526ee7e09 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Mon, 28 Jan 2008 21:00:20 +0000
Subject: added ability to "extend" helpers * modified Loader to check for
 prefixed helpers in application/helpers folder * surrounded provided helper
 functions with if (! function_exists('foo')) conditionals so the user's
 helper functions take precedent.

---
 system/helpers/inflector_helper.php | 133 ++++++++++++++++++++----------------
 1 file changed, 73 insertions(+), 60 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index b1864cb0b..bf70a6799 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -36,34 +36,36 @@
  * @access	public
  * @param	string
  * @return	str
- */		
-function singular($str)
-{
-    $str = strtolower(trim($str));
-    $end = substr($str, -3);
+ */	
+if (! function_exists('singular'))
+{	
+	function singular($str)
+	{
+	    $str = strtolower(trim($str));
+	    $end = substr($str, -3);
     
-    if ($end == 'ies')
-    {
-        $str = substr($str, 0, strlen($str)-3).'y';
-    }
-    elseif ($end == 'ses')
-    {
-        $str = substr($str, 0, strlen($str)-2);
-    }
-    else
-    {
-        $end = substr($str, -1);
+	    if ($end == 'ies')
+	    {
+	        $str = substr($str, 0, strlen($str)-3).'y';
+	    }
+	    elseif ($end == 'ses')
+	    {
+	        $str = substr($str, 0, strlen($str)-2);
+	    }
+	    else
+	    {
+	        $end = substr($str, -1);
         
-        if ($end == 's')
-        {
-            $str = substr($str, 0, strlen($str)-1);
-        }
-    }
+	        if ($end == 's')
+	        {
+	            $str = substr($str, 0, strlen($str)-1);
+	        }
+	    }
     
-    return $str;
+	    return $str;
+	}
 }
 
-
 // --------------------------------------------------------------------
 
 /**
@@ -75,32 +77,34 @@ function singular($str)
  * @param	string
  * @param	bool
  * @return	str
- */		
-function plural($str, $force = FALSE)
-{
-    $str = strtolower(trim($str));
-    $end = substr($str, -1);
-
-    if ($end == 'y')
-    {
-        $str = substr($str, 0, strlen($str)-1).'ies';
-    }
-    elseif ($end == 's')
-    {
-        if ($force == TRUE)
-        {
-            $str .= 'es';
-        }
-    }
-    else
-    {
-        $str .= 's';
-    }
-
-    return $str;
+ */	
+if (! function_exists('plural'))
+{	
+	function plural($str, $force = FALSE)
+	{
+	    $str = strtolower(trim($str));
+	    $end = substr($str, -1);
+
+	    if ($end == 'y')
+	    {
+	        $str = substr($str, 0, strlen($str)-1).'ies';
+	    }
+	    elseif ($end == 's')
+	    {
+	        if ($force == TRUE)
+	        {
+	            $str .= 'es';
+	        }
+	    }
+	    else
+	    {
+	        $str .= 's';
+	    }
+
+	    return $str;
+	}
 }
 
-
 // --------------------------------------------------------------------
 
 /**
@@ -111,12 +115,15 @@ function plural($str, $force = FALSE)
  * @access	public
  * @param	string
  * @return	str
- */		
-function camelize($str)
-{		
-	$str = 'x'.strtolower(trim($str));
-	$str = ucwords(preg_replace('/[\s_]+/', ' ', $str));
-	return substr(str_replace(' ', '', $str), 1);
+ */	
+if (! function_exists('camelize'))
+{	
+	function camelize($str)
+	{		
+		$str = 'x'.strtolower(trim($str));
+		$str = ucwords(preg_replace('/[\s_]+/', ' ', $str));
+		return substr(str_replace(' ', '', $str), 1);
+	}
 }
 
 // --------------------------------------------------------------------
@@ -129,10 +136,13 @@ function camelize($str)
  * @access	public
  * @param	string
  * @return	str
- */		
-function underscore($str)
+ */	
+if (! function_exists('underscore'))
 {
-	return preg_replace('/[\s]+/', '_', strtolower(trim($str)));
+	function underscore($str)
+	{
+		return preg_replace('/[\s]+/', '_', strtolower(trim($str)));
+	}
 }
 
 // --------------------------------------------------------------------
@@ -145,10 +155,13 @@ function underscore($str)
  * @access	public
  * @param	string
  * @return	str
- */		
-function humanize($str)
-{
-	return ucwords(preg_replace('/[_]+/', ' ', strtolower(trim($str))));
+ */	
+if (! function_exists('humanize'))
+{	
+	function humanize($str)
+	{
+		return ucwords(preg_replace('/[_]+/', ' ', strtolower(trim($str))));
+	}
 }
 	
 ?>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 5583e1aae64ff7e902136c4ba610d438dc2015d4 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Sun, 11 May 2008 15:48:20 +0000
Subject: removed closing PHP tag from all framework files

---
 system/helpers/inflector_helper.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index bf70a6799..a833c70b8 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -164,4 +164,3 @@ if (! function_exists('humanize'))
 	}
 }
 	
-?>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From c7deac9f2f9e43cedb18202542e8a46061df046e Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Sun, 11 May 2008 16:27:41 +0000
Subject: Undoing change committed in r1115

---
 system/helpers/inflector_helper.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index a833c70b8..bf70a6799 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -164,3 +164,4 @@ if (! function_exists('humanize'))
 	}
 }
 	
+?>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From a3ffbbb75ab9403941e4f810703313432b3993cc Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Sun, 11 May 2008 18:18:29 +0000
Subject: Removed closing PHP tags, replaced with a comment block identifying
 the end of the file

---
 system/helpers/inflector_helper.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index bf70a6799..b0b99be54 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -164,4 +164,6 @@ if (! function_exists('humanize'))
 	}
 }
 	
-?>
\ No newline at end of file
+
+/* End of file inflector_helper.php */
+/* Location: ./system/helpers/inflector_helper.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 0b59f270a432f8c7b6128981f0a39b4a2e2fbd34 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Tue, 13 May 2008 04:22:33 +0000
Subject: Some sweeping syntax changes for consistency:

(! foo) changed to ( ! foo)
|| changed to OR
changed newline standardization code in various places from preg_replace to str_replace
---
 system/helpers/inflector_helper.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index b0b99be54..49ba542a1 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -1,4 +1,4 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -37,7 +37,7 @@
  * @param	string
  * @return	str
  */	
-if (! function_exists('singular'))
+if ( ! function_exists('singular'))
 {	
 	function singular($str)
 	{
@@ -78,7 +78,7 @@ if (! function_exists('singular'))
  * @param	bool
  * @return	str
  */	
-if (! function_exists('plural'))
+if ( ! function_exists('plural'))
 {	
 	function plural($str, $force = FALSE)
 	{
@@ -116,7 +116,7 @@ if (! function_exists('plural'))
  * @param	string
  * @return	str
  */	
-if (! function_exists('camelize'))
+if ( ! function_exists('camelize'))
 {	
 	function camelize($str)
 	{		
@@ -137,7 +137,7 @@ if (! function_exists('camelize'))
  * @param	string
  * @return	str
  */	
-if (! function_exists('underscore'))
+if ( ! function_exists('underscore'))
 {
 	function underscore($str)
 	{
@@ -156,7 +156,7 @@ if (! function_exists('underscore'))
  * @param	string
  * @return	str
  */	
-if (! function_exists('humanize'))
+if ( ! function_exists('humanize'))
 {	
 	function humanize($str)
 	{
@@ -164,6 +164,6 @@ if (! function_exists('humanize'))
 	}
 }
 	
-
-/* End of file inflector_helper.php */
+
+/* End of file inflector_helper.php */
 /* Location: ./system/helpers/inflector_helper.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 993925b47a0bfb08e79961c47bcc3d247a03a5dd Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Thu, 21 Aug 2008 12:43:31 +0000
Subject: whitespace fixes a minor re-ordering of the changelog

---
 system/helpers/inflector_helper.php | 84 ++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 49ba542a1..e362a3fd7 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -41,28 +41,28 @@ if ( ! function_exists('singular'))
 {	
 	function singular($str)
 	{
-	    $str = strtolower(trim($str));
-	    $end = substr($str, -3);
-    
-	    if ($end == 'ies')
-	    {
-	        $str = substr($str, 0, strlen($str)-3).'y';
-	    }
-	    elseif ($end == 'ses')
-	    {
-	        $str = substr($str, 0, strlen($str)-2);
-	    }
-	    else
-	    {
-	        $end = substr($str, -1);
-        
-	        if ($end == 's')
-	        {
-	            $str = substr($str, 0, strlen($str)-1);
-	        }
-	    }
-    
-	    return $str;
+		$str = strtolower(trim($str));
+		$end = substr($str, -3);
+	
+		if ($end == 'ies')
+		{
+			$str = substr($str, 0, strlen($str)-3).'y';
+		}
+		elseif ($end == 'ses')
+		{
+			$str = substr($str, 0, strlen($str)-2);
+		}
+		else
+		{
+			$end = substr($str, -1);
+		
+			if ($end == 's')
+			{
+				$str = substr($str, 0, strlen($str)-1);
+			}
+		}
+	
+		return $str;
 	}
 }
 
@@ -82,26 +82,26 @@ if ( ! function_exists('plural'))
 {	
 	function plural($str, $force = FALSE)
 	{
-	    $str = strtolower(trim($str));
-	    $end = substr($str, -1);
-
-	    if ($end == 'y')
-	    {
-	        $str = substr($str, 0, strlen($str)-1).'ies';
-	    }
-	    elseif ($end == 's')
-	    {
-	        if ($force == TRUE)
-	        {
-	            $str .= 'es';
-	        }
-	    }
-	    else
-	    {
-	        $str .= 's';
-	    }
-
-	    return $str;
+		$str = strtolower(trim($str));
+		$end = substr($str, -1);
+
+		if ($end == 'y')
+		{
+			$str = substr($str, 0, strlen($str)-1).'ies';
+		}
+		elseif ($end == 's')
+		{
+			if ($force == TRUE)
+			{
+				$str .= 'es';
+			}
+		}
+		else
+		{
+			$str .= 's';
+		}
+
+		return $str;
 	}
 }
 
-- 
cgit v1.2.3-24-g4f1b


From 86d721ca61641289807af421bd79456851cd311d Mon Sep 17 00:00:00 2001
From: Rick Ellis <rick.ellis@ellislab.com>
Date: Fri, 12 Sep 2008 23:33:40 +0000
Subject: updated copyright

---
 system/helpers/inflector_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index e362a3fd7..8a87e50e5 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -6,7 +6,7 @@
  *
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2006, EllisLab, Inc.
+ * @copyright	Copyright (c) 2008, EllisLab, Inc.
  * @license		http://codeigniter.com/user_guide/license.html
  * @link		http://codeigniter.com
  * @since		Version 1.0
-- 
cgit v1.2.3-24-g4f1b


From 2067d1a727e7eb5e5ffb40e967f3d1fc4c8a41b2 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Thu, 13 Nov 2008 22:59:24 +0000
Subject: Changing EOL style to LF

---
 system/helpers/inflector_helper.php | 336 ++++++++++++++++++------------------
 1 file changed, 168 insertions(+), 168 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 8a87e50e5..9393f11e4 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -1,169 +1,169 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP 4.3.2 or newer
- *
- * @package		CodeIgniter
- * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2008, EllisLab, Inc.
- * @license		http://codeigniter.com/user_guide/license.html
- * @link		http://codeigniter.com
- * @since		Version 1.0
- * @filesource
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * CodeIgniter Inflector Helpers
- *
- * @package		CodeIgniter
- * @subpackage	Helpers
- * @category	Helpers
- * @author		ExpressionEngine Dev Team
- * @link		http://codeigniter.com/user_guide/helpers/directory_helper.html
- */
-
-
-// --------------------------------------------------------------------
-
-/**
- * Singular
- *
- * Takes a plural word and makes it singular
- *
- * @access	public
- * @param	string
- * @return	str
- */	
-if ( ! function_exists('singular'))
-{	
-	function singular($str)
-	{
-		$str = strtolower(trim($str));
-		$end = substr($str, -3);
-	
-		if ($end == 'ies')
-		{
-			$str = substr($str, 0, strlen($str)-3).'y';
-		}
-		elseif ($end == 'ses')
-		{
-			$str = substr($str, 0, strlen($str)-2);
-		}
-		else
-		{
-			$end = substr($str, -1);
-		
-			if ($end == 's')
-			{
-				$str = substr($str, 0, strlen($str)-1);
-			}
-		}
-	
-		return $str;
-	}
-}
-
-// --------------------------------------------------------------------
-
-/**
- * Plural
- *
- * Takes a singular word and makes it plural
- *
- * @access	public
- * @param	string
- * @param	bool
- * @return	str
- */	
-if ( ! function_exists('plural'))
-{	
-	function plural($str, $force = FALSE)
-	{
-		$str = strtolower(trim($str));
-		$end = substr($str, -1);
-
-		if ($end == 'y')
-		{
-			$str = substr($str, 0, strlen($str)-1).'ies';
-		}
-		elseif ($end == 's')
-		{
-			if ($force == TRUE)
-			{
-				$str .= 'es';
-			}
-		}
-		else
-		{
-			$str .= 's';
-		}
-
-		return $str;
-	}
-}
-
-// --------------------------------------------------------------------
-
-/**
- * Camelize
- *
- * Takes multiple words separated by spaces or underscores and camelizes them
- *
- * @access	public
- * @param	string
- * @return	str
- */	
-if ( ! function_exists('camelize'))
-{	
-	function camelize($str)
-	{		
-		$str = 'x'.strtolower(trim($str));
-		$str = ucwords(preg_replace('/[\s_]+/', ' ', $str));
-		return substr(str_replace(' ', '', $str), 1);
-	}
-}
-
-// --------------------------------------------------------------------
-
-/**
- * Underscore
- *
- * Takes multiple words separated by spaces and underscores them
- *
- * @access	public
- * @param	string
- * @return	str
- */	
-if ( ! function_exists('underscore'))
-{
-	function underscore($str)
-	{
-		return preg_replace('/[\s]+/', '_', strtolower(trim($str)));
-	}
-}
-
-// --------------------------------------------------------------------
-
-/**
- * Humanize
- *
- * Takes multiple words separated by underscores and changes them to spaces
- *
- * @access	public
- * @param	string
- * @return	str
- */	
-if ( ! function_exists('humanize'))
-{	
-	function humanize($str)
-	{
-		return ucwords(preg_replace('/[_]+/', ' ', strtolower(trim($str))));
-	}
-}
-	
-
-/* End of file inflector_helper.php */
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP 4.3.2 or newer
+ *
+ * @package		CodeIgniter
+ * @author		ExpressionEngine Dev Team
+ * @copyright	Copyright (c) 2008, EllisLab, Inc.
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
+ * @since		Version 1.0
+ * @filesource
+ */
+
+// ------------------------------------------------------------------------
+
+/**
+ * CodeIgniter Inflector Helpers
+ *
+ * @package		CodeIgniter
+ * @subpackage	Helpers
+ * @category	Helpers
+ * @author		ExpressionEngine Dev Team
+ * @link		http://codeigniter.com/user_guide/helpers/directory_helper.html
+ */
+
+
+// --------------------------------------------------------------------
+
+/**
+ * Singular
+ *
+ * Takes a plural word and makes it singular
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */	
+if ( ! function_exists('singular'))
+{	
+	function singular($str)
+	{
+		$str = strtolower(trim($str));
+		$end = substr($str, -3);
+	
+		if ($end == 'ies')
+		{
+			$str = substr($str, 0, strlen($str)-3).'y';
+		}
+		elseif ($end == 'ses')
+		{
+			$str = substr($str, 0, strlen($str)-2);
+		}
+		else
+		{
+			$end = substr($str, -1);
+		
+			if ($end == 's')
+			{
+				$str = substr($str, 0, strlen($str)-1);
+			}
+		}
+	
+		return $str;
+	}
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Plural
+ *
+ * Takes a singular word and makes it plural
+ *
+ * @access	public
+ * @param	string
+ * @param	bool
+ * @return	str
+ */	
+if ( ! function_exists('plural'))
+{	
+	function plural($str, $force = FALSE)
+	{
+		$str = strtolower(trim($str));
+		$end = substr($str, -1);
+
+		if ($end == 'y')
+		{
+			$str = substr($str, 0, strlen($str)-1).'ies';
+		}
+		elseif ($end == 's')
+		{
+			if ($force == TRUE)
+			{
+				$str .= 'es';
+			}
+		}
+		else
+		{
+			$str .= 's';
+		}
+
+		return $str;
+	}
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Camelize
+ *
+ * Takes multiple words separated by spaces or underscores and camelizes them
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */	
+if ( ! function_exists('camelize'))
+{	
+	function camelize($str)
+	{		
+		$str = 'x'.strtolower(trim($str));
+		$str = ucwords(preg_replace('/[\s_]+/', ' ', $str));
+		return substr(str_replace(' ', '', $str), 1);
+	}
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Underscore
+ *
+ * Takes multiple words separated by spaces and underscores them
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */	
+if ( ! function_exists('underscore'))
+{
+	function underscore($str)
+	{
+		return preg_replace('/[\s]+/', '_', strtolower(trim($str)));
+	}
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Humanize
+ *
+ * Takes multiple words separated by underscores and changes them to spaces
+ *
+ * @access	public
+ * @param	string
+ * @return	str
+ */	
+if ( ! function_exists('humanize'))
+{	
+	function humanize($str)
+	{
+		return ucwords(preg_replace('/[_]+/', ' ', strtolower(trim($str))));
+	}
+}
+	
+
+/* End of file inflector_helper.php */
 /* Location: ./system/helpers/inflector_helper.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From a6aabaff9a396436d36b57df84eec77ee72e70ed Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Tue, 10 Feb 2009 17:37:52 +0000
Subject: Fixed a bug in plural() with words that end in y

http://codeigniter.com/bug_tracker/bug/6342/
---
 system/helpers/inflector_helper.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 9393f11e4..39db5d4af 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -87,7 +87,9 @@ if ( ! function_exists('plural'))
 
 		if ($end == 'y')
 		{
-			$str = substr($str, 0, strlen($str)-1).'ies';
+			// Y preceded by vowel => regular plural
+			$vowels = array('a', 'e', 'i', 'o', 'u');
+			$str = in_array(substr($str, -2, 1), $vowels) ? $str.'s' : substr($str, 0, -1).'ies';
 		}
 		elseif ($end == 's')
 		{
-- 
cgit v1.2.3-24-g4f1b


From fc395a1046441cb584cbcfe42651dacece7eca3e Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Wed, 22 Apr 2009 14:15:09 +0000
Subject: updated copyrights to 2009

---
 system/helpers/inflector_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 39db5d4af..e65968a9d 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -6,7 +6,7 @@
  *
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2008, EllisLab, Inc.
+ * @copyright	Copyright (c) 2008 - 2009, EllisLab, Inc.
  * @license		http://codeigniter.com/user_guide/license.html
  * @link		http://codeigniter.com
  * @since		Version 1.0
-- 
cgit v1.2.3-24-g4f1b


From a3f47180e3885fca82599e90c95ce6e5c26072d6 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Wed, 4 Nov 2009 17:23:32 +0000
Subject: Modified inflector helper to properly pluralize words that end in
 'ch' or 'sh'

http://codeigniter.com/bug_tracker/bug/9384/
---
 system/helpers/inflector_helper.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index e65968a9d..8db4f3d75 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -91,6 +91,17 @@ if ( ! function_exists('plural'))
 			$vowels = array('a', 'e', 'i', 'o', 'u');
 			$str = in_array(substr($str, -2, 1), $vowels) ? $str.'s' : substr($str, 0, -1).'ies';
 		}
+		elseif ($end == 'h')
+		{
+		    if (substr($str, -2) == 'ch' || substr($str, -2) == 'sh')
+		    {
+		        $str .= 'es';
+		    }
+		    else
+		    {
+		        $str .= 's';
+		    }
+		}
 		elseif ($end == 's')
 		{
 			if ($force == TRUE)
-- 
cgit v1.2.3-24-g4f1b


From 7f3719faf120dc15f3d7b45e132ab3192f60ad62 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Tue, 5 Jan 2010 13:35:37 +0000
Subject: updated copyrights

---
 system/helpers/inflector_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 8db4f3d75..c4c530bc5 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -6,7 +6,7 @@
  *
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2008 - 2009, EllisLab, Inc.
+ * @copyright	Copyright (c) 2008 - 2010, EllisLab, Inc.
  * @license		http://codeigniter.com/user_guide/license.html
  * @link		http://codeigniter.com
  * @since		Version 1.0
-- 
cgit v1.2.3-24-g4f1b


From dd6719738936be31cdaa1758ca86d5eb14dcab3d Mon Sep 17 00:00:00 2001
From: Barry Mieny <barry@mieny.com>
Date: Mon, 4 Oct 2010 16:33:58 +0200
Subject: Cleanup of stray spaces and tabs

---
 system/helpers/inflector_helper.php | 44 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index c4c530bc5..cd05c8d6d 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -36,14 +36,14 @@
  * @access	public
  * @param	string
  * @return	str
- */	
+ */
 if ( ! function_exists('singular'))
-{	
+{
 	function singular($str)
 	{
 		$str = strtolower(trim($str));
 		$end = substr($str, -3);
-	
+
 		if ($end == 'ies')
 		{
 			$str = substr($str, 0, strlen($str)-3).'y';
@@ -55,13 +55,13 @@ if ( ! function_exists('singular'))
 		else
 		{
 			$end = substr($str, -1);
-		
+
 			if ($end == 's')
 			{
 				$str = substr($str, 0, strlen($str)-1);
 			}
 		}
-	
+
 		return $str;
 	}
 }
@@ -77,9 +77,9 @@ if ( ! function_exists('singular'))
  * @param	string
  * @param	bool
  * @return	str
- */	
+ */
 if ( ! function_exists('plural'))
-{	
+{
 	function plural($str, $force = FALSE)
 	{
 		$str = strtolower(trim($str));
@@ -93,14 +93,14 @@ if ( ! function_exists('plural'))
 		}
 		elseif ($end == 'h')
 		{
-		    if (substr($str, -2) == 'ch' || substr($str, -2) == 'sh')
-		    {
-		        $str .= 'es';
-		    }
-		    else
-		    {
-		        $str .= 's';
-		    }
+			if (substr($str, -2) == 'ch' || substr($str, -2) == 'sh')
+			{
+				$str .= 'es';
+			}
+			else
+			{
+				$str .= 's';
+			}
 		}
 		elseif ($end == 's')
 		{
@@ -128,11 +128,11 @@ if ( ! function_exists('plural'))
  * @access	public
  * @param	string
  * @return	str
- */	
+ */
 if ( ! function_exists('camelize'))
-{	
+{
 	function camelize($str)
-	{		
+	{
 		$str = 'x'.strtolower(trim($str));
 		$str = ucwords(preg_replace('/[\s_]+/', ' ', $str));
 		return substr(str_replace(' ', '', $str), 1);
@@ -149,7 +149,7 @@ if ( ! function_exists('camelize'))
  * @access	public
  * @param	string
  * @return	str
- */	
+ */
 if ( ! function_exists('underscore'))
 {
 	function underscore($str)
@@ -168,15 +168,15 @@ if ( ! function_exists('underscore'))
  * @access	public
  * @param	string
  * @return	str
- */	
+ */
 if ( ! function_exists('humanize'))
-{	
+{
 	function humanize($str)
 	{
 		return ucwords(preg_replace('/[_]+/', ' ', strtolower(trim($str))));
 	}
 }
-	
+
 
 /* End of file inflector_helper.php */
 /* Location: ./system/helpers/inflector_helper.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 741de1c1319dd13de75348863cca591713dd46ce Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Wed, 10 Nov 2010 14:52:57 -0600
Subject: Updating PHP requirements in files  5.1.6

---
 system/helpers/inflector_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index cd05c8d6d..3d9acfcf0 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -2,7 +2,7 @@
 /**
  * CodeIgniter
  *
- * An open source application development framework for PHP 4.3.2 or newer
+ * An open source application development framework for PHP 5.1.6 or newer
  *
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
-- 
cgit v1.2.3-24-g4f1b


From 0711dc87d98ce20d3a87f7ac43d78af8fba1dca7 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Wed, 5 Jan 2011 10:49:40 -0600
Subject: Hey look, it's 2011

---
 system/helpers/inflector_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 3d9acfcf0..ed9ab5f9d 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -6,7 +6,7 @@
  *
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2008 - 2010, EllisLab, Inc.
+ * @copyright	Copyright (c) 2008 - 2011, EllisLab, Inc.
  * @license		http://codeigniter.com/user_guide/license.html
  * @link		http://codeigniter.com
  * @since		Version 1.0
-- 
cgit v1.2.3-24-g4f1b


From 7b3be2fbcf62791918be5fe6d5c42eb005eb7342 Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Tue, 11 Jan 2011 08:52:09 -0500
Subject:  Changed || to OR to match coding standards

---
 system/helpers/inflector_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 3d9acfcf0..88f48d48e 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -93,7 +93,7 @@ if ( ! function_exists('plural'))
 		}
 		elseif ($end == 'h')
 		{
-			if (substr($str, -2) == 'ch' || substr($str, -2) == 'sh')
+			if (substr($str, -2) == 'ch' OR substr($str, -2) == 'sh')
 			{
 				$str .= 'es';
 			}
-- 
cgit v1.2.3-24-g4f1b


From 7c6a5891c25bfdd392ed6317fd8f87b58386f030 Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@gmail.com>
Date: Fri, 11 Mar 2011 17:33:05 -0500
Subject: Changed the 'plural' function so that it doesn't ruin the
 captalization of your string. It also take into consideration acronyms which
 are all caps.

---
 system/helpers/inflector_helper.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 4cd7486b4..3042202cb 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -82,18 +82,17 @@ if ( ! function_exists('plural'))
 {
 	function plural($str, $force = FALSE)
 	{
-		$str = strtolower(trim($str));
 		$end = substr($str, -1);
 
-		if ($end == 'y')
+		if (preg_match('/y/i',$end))
 		{
 			// Y preceded by vowel => regular plural
-			$vowels = array('a', 'e', 'i', 'o', 'u');
+			$vowels = array('a', 'e', 'i', 'o', 'u', 'A', 'E', 'I', 'O', 'U');
 			$str = in_array(substr($str, -2, 1), $vowels) ? $str.'s' : substr($str, 0, -1).'ies';
 		}
-		elseif ($end == 'h')
+		elseif (preg_match('/h/i',$end))
 		{
-			if (substr($str, -2) == 'ch' OR substr($str, -2) == 'sh')
+            if(preg_match('/^[c|s]h$/i',substr($str, -2)))
 			{
 				$str .= 'es';
 			}
@@ -102,7 +101,7 @@ if ( ! function_exists('plural'))
 				$str .= 's';
 			}
 		}
-		elseif ($end == 's')
+		elseif (preg_match('/s/i',$end))
 		{
 			if ($force == TRUE)
 			{
-- 
cgit v1.2.3-24-g4f1b


From af376a2df84123549293af846f827ff4da30bf5e Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@gmail.com>
Date: Fri, 11 Mar 2011 17:46:53 -0500
Subject: Forgot to trim the string first.

---
 system/helpers/inflector_helper.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 3042202cb..e1cd66be0 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -81,7 +81,8 @@ if ( ! function_exists('singular'))
 if ( ! function_exists('plural'))
 {
 	function plural($str, $force = FALSE)
-	{
+	{   
+        $str = trim($str);
 		$end = substr($str, -1);
 
 		if (preg_match('/y/i',$end))
-- 
cgit v1.2.3-24-g4f1b


From 2f620fe804ae5b7f4f20adc70ceaee1cf616a655 Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@gmail.com>
Date: Fri, 11 Mar 2011 18:34:07 -0500
Subject: Fixed the capitalization "bug" in the singular function as well.

---
 system/helpers/inflector_helper.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index e1cd66be0..c7c113b8a 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -41,20 +41,22 @@ if ( ! function_exists('singular'))
 {
 	function singular($str)
 	{
-		$str = strtolower(trim($str));
+		$str = trim($str);
 		$end = substr($str, -3);
-
-		if ($end == 'ies')
+        
+        $str = preg_replace('/(.*)?([s|c]h)es/i','$1$2',$str);
+        
+		if (strtolower($end) == 'ies')
 		{
-			$str = substr($str, 0, strlen($str)-3).'y';
+			$str = substr($str, 0, strlen($str)-3).(preg_match('/[a-z]/',$end) ? 'y' : 'Y');
 		}
-		elseif ($end == 'ses')
+		elseif (strtolower($end) == 'ses')
 		{
 			$str = substr($str, 0, strlen($str)-2);
 		}
 		else
 		{
-			$end = substr($str, -1);
+			$end = strtolower(substr($str, -1));
 
 			if ($end == 's')
 			{
-- 
cgit v1.2.3-24-g4f1b


From 114ab0988e20ac6be39ad363ff897a1a3b85e565 Mon Sep 17 00:00:00 2001
From: Razican <devnull@localhost>
Date: Mon, 25 Apr 2011 17:26:45 +0200
Subject: Fixed double-space typo.

---
 system/helpers/inflector_helper.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index c7c113b8a..2352b642e 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -1,4 +1,4 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -43,9 +43,9 @@ if ( ! function_exists('singular'))
 	{
 		$str = trim($str);
 		$end = substr($str, -3);
-        
-        $str = preg_replace('/(.*)?([s|c]h)es/i','$1$2',$str);
-        
+
+    $str = preg_replace('/(.*)?([s|c]h)es/i','$1$2',$str);
+
 		if (strtolower($end) == 'ies')
 		{
 			$str = substr($str, 0, strlen($str)-3).(preg_match('/[a-z]/',$end) ? 'y' : 'Y');
@@ -83,8 +83,8 @@ if ( ! function_exists('singular'))
 if ( ! function_exists('plural'))
 {
 	function plural($str, $force = FALSE)
-	{   
-        $str = trim($str);
+	{
+    $str = trim($str);
 		$end = substr($str, -1);
 
 		if (preg_match('/y/i',$end))
@@ -95,7 +95,7 @@ if ( ! function_exists('plural'))
 		}
 		elseif (preg_match('/h/i',$end))
 		{
-            if(preg_match('/^[c|s]h$/i',substr($str, -2)))
+      if(preg_match('/^[c|s]h$/i',substr($str, -2)))
 			{
 				$str .= 'es';
 			}
-- 
cgit v1.2.3-24-g4f1b


From 4b9c62980599228f070b401c7673dce8085b0c61 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:40:48 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 system/helpers/inflector_helper.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 2352b642e..c7c113b8a 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -43,9 +43,9 @@ if ( ! function_exists('singular'))
 	{
 		$str = trim($str);
 		$end = substr($str, -3);
-
-    $str = preg_replace('/(.*)?([s|c]h)es/i','$1$2',$str);
-
+        
+        $str = preg_replace('/(.*)?([s|c]h)es/i','$1$2',$str);
+        
 		if (strtolower($end) == 'ies')
 		{
 			$str = substr($str, 0, strlen($str)-3).(preg_match('/[a-z]/',$end) ? 'y' : 'Y');
@@ -83,8 +83,8 @@ if ( ! function_exists('singular'))
 if ( ! function_exists('plural'))
 {
 	function plural($str, $force = FALSE)
-	{
-    $str = trim($str);
+	{   
+        $str = trim($str);
 		$end = substr($str, -1);
 
 		if (preg_match('/y/i',$end))
@@ -95,7 +95,7 @@ if ( ! function_exists('plural'))
 		}
 		elseif (preg_match('/h/i',$end))
 		{
-      if(preg_match('/^[c|s]h$/i',substr($str, -2)))
+            if(preg_match('/^[c|s]h$/i',substr($str, -2)))
 			{
 				$str .= 'es';
 			}
-- 
cgit v1.2.3-24-g4f1b


From 99f6c8c4d71714e62a86cee5d2f7fbfa496a3c5a Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Sat, 13 Aug 2011 10:26:04 -0600
Subject: Improved logic for plural() and singular() as words like "tax" would
 become "taxs" and it was tough to code in new rules.

---
 system/helpers/inflector_helper.php | 115 +++++++++++++++++++++---------------
 1 file changed, 67 insertions(+), 48 deletions(-)

(limited to 'system/helpers/inflector_helper.php')

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index c7c113b8a..7b99bc5b4 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -41,30 +41,48 @@ if ( ! function_exists('singular'))
 {
 	function singular($str)
 	{
-		$str = trim($str);
-		$end = substr($str, -3);
-        
-        $str = preg_replace('/(.*)?([s|c]h)es/i','$1$2',$str);
-        
-		if (strtolower($end) == 'ies')
+		$result = strval($str);
+
+		$singular_rules = array(
+			'/(matr)ices$/'         => '\1ix',
+			'/(vert|ind)ices$/'     => '\1ex',
+			'/^(ox)en/'             => '\1',
+			'/(alias)es$/'          => '\1',
+			'/([octop|vir])i$/'     => '\1us',
+			'/(cris|ax|test)es$/'   => '\1is',
+			'/(shoe)s$/'            => '\1',
+			'/(o)es$/'              => '\1',
+			'/(bus|campus)es$/'     => '\1',
+			'/([m|l])ice$/'         => '\1ouse',
+			'/(x|ch|ss|sh)es$/'     => '\1',
+			'/(m)ovies$/'           => '\1\2ovie',
+			'/(s)eries$/'           => '\1\2eries',
+			'/([^aeiouy]|qu)ies$/'  => '\1y',
+			'/([lr])ves$/'          => '\1f',
+			'/(tive)s$/'            => '\1',
+			'/(hive)s$/'            => '\1',
+			'/([^f])ves$/'          => '\1fe',
+			'/(^analy)ses$/'        => '\1sis',
+			'/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/' => '\1\2sis',
+			'/([ti])a$/'            => '\1um',
+			'/(p)eople$/'           => '\1\2erson',
+			'/(m)en$/'              => '\1an',
+			'/(s)tatuses$/'         => '\1\2tatus',
+			'/(c)hildren$/'         => '\1\2hild',
+			'/(n)ews$/'             => '\1\2ews',
+			'/([^u])s$/'            => '\1',
+		);
+		
+		foreach ($singular_rules as $rule => $replacement)
 		{
-			$str = substr($str, 0, strlen($str)-3).(preg_match('/[a-z]/',$end) ? 'y' : 'Y');
-		}
-		elseif (strtolower($end) == 'ses')
-		{
-			$str = substr($str, 0, strlen($str)-2);
-		}
-		else
-		{
-			$end = strtolower(substr($str, -1));
-
-			if ($end == 's')
+			if (preg_match($rule, $result))
 			{
-				$str = substr($str, 0, strlen($str)-1);
+				$result = preg_replace($rule, $replacement, $result);
+				break;
 			}
 		}
 
-		return $str;
+		return $result;
 	}
 }
 
@@ -83,40 +101,41 @@ if ( ! function_exists('singular'))
 if ( ! function_exists('plural'))
 {
 	function plural($str, $force = FALSE)
-	{   
-        $str = trim($str);
-		$end = substr($str, -1);
-
-		if (preg_match('/y/i',$end))
-		{
-			// Y preceded by vowel => regular plural
-			$vowels = array('a', 'e', 'i', 'o', 'u', 'A', 'E', 'I', 'O', 'U');
-			$str = in_array(substr($str, -2, 1), $vowels) ? $str.'s' : substr($str, 0, -1).'ies';
-		}
-		elseif (preg_match('/h/i',$end))
-		{
-            if(preg_match('/^[c|s]h$/i',substr($str, -2)))
-			{
-				$str .= 'es';
-			}
-			else
-			{
-				$str .= 's';
-			}
-		}
-		elseif (preg_match('/s/i',$end))
+	{
+		$result = strval($str);
+	
+		$plural_rules = array(
+			'/^(ox)$/'                 => '\1\2en',     // ox
+			'/([m|l])ouse$/'           => '\1ice',      // mouse, louse
+			'/(matr|vert|ind)ix|ex$/'  => '\1ices',     // matrix, vertex, index
+			'/(x|ch|ss|sh)$/'          => '\1es',       // search, switch, fix, box, process, address
+			'/([^aeiouy]|qu)y$/'       => '\1ies',      // query, ability, agency
+			'/(hive)$/'                => '\1s',        // archive, hive
+			'/(?:([^f])fe|([lr])f)$/'  => '\1\2ves',    // half, safe, wife
+			'/sis$/'                   => 'ses',        // basis, diagnosis
+			'/([ti])um$/'              => '\1a',        // datum, medium
+			'/(p)erson$/'              => '\1eople',    // person, salesperson
+			'/(m)an$/'                 => '\1en',       // man, woman, spokesman
+			'/(c)hild$/'               => '\1hildren',  // child
+			'/(buffal|tomat)o$/'       => '\1\2oes',    // buffalo, tomato
+			'/(bu|campu)s$/'           => '\1\2ses',    // bus, campus
+			'/(alias|status|virus)/'   => '\1es',       // alias
+			'/(octop)us$/'             => '\1i',        // octopus
+			'/(ax|cris|test)is$/'      => '\1es',       // axis, crisis
+			'/s$/'                     => 's',          // no change (compatibility)
+			'/$/'                      => 's',
+		);
+
+		foreach ($plural_rules as $rule => $replacement)
 		{
-			if ($force == TRUE)
+			if (preg_match($rule, $result))
 			{
-				$str .= 'es';
+				$result = preg_replace($rule, $replacement, $result);
+				break;
 			}
 		}
-		else
-		{
-			$str .= 's';
-		}
 
-		return $str;
+		return $result;
 	}
 }
 
-- 
cgit v1.2.3-24-g4f1b