hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit

1 files changed, 7 insertions, 7 deletions

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';
 			}