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

1 files changed, 14 insertions, 14 deletions

diff --git a/system/core/Common.php b/system/core/Common.php
index e50f7794a..db9fbeb9f 100644
--- a/system/core/Common.php
+++ b/system/core/Common.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
  *
@@ -61,7 +61,7 @@ if ( ! function_exists('is_php'))
  * Tests for file writability
  *
  * is_writable() returns TRUE on Windows servers when you really can't write to
- * the file, based on the read-only attribute. is_writable() is also unreliable
+ * the file, based on the read-only attribute.  is_writable() is also unreliable
  * on Unix servers if safe_mode is on.
  *
  * @access	private
@@ -78,7 +78,7 @@ if ( ! function_exists('is_really_writable'))
 		}
 
 		// For windows servers and safe_mode "on" installations we'll actually
-		// write a file then read it. Bah...
+		// write a file then read it.  Bah...
 		if (is_dir($file))
 		{
 			$file = rtrim($file, '/').'/'.md5(mt_rand(1,100).mt_rand(1,100));
@@ -108,8 +108,8 @@ if ( ! function_exists('is_really_writable'))
 /**
 * Class registry
 *
-* This function acts as a singleton. If the requested class does not
-* exist it is instantiated and set to a static variable. If it has
+* This function acts as a singleton.  If the requested class does not
+* exist it is instantiated and set to a static variable.  If it has
 * previously been instantiated the variable is returned.
 *
 * @access	public
@@ -124,7 +124,7 @@ if ( ! function_exists('load_class'))
 	{
 		static $_classes = array();
 
-		// Does the class exist? If so, we're done...
+		// Does the class exist?  If so, we're done...
 		if (isset($_classes[$class]))
 		{
 			return $_classes[$class];
@@ -149,7 +149,7 @@ if ( ! function_exists('load_class'))
 			}
 		}
 
-		// Is the request a class extension? If so we load it too
+		// Is the request a class extension?  If so we load it too
 		if (file_exists(APPPATH.$directory.'/'.config_item('subclass_prefix').$class.'.php'))
 		{
 			$name = config_item('subclass_prefix').$class;
@@ -179,7 +179,7 @@ if ( ! function_exists('load_class'))
 // --------------------------------------------------------------------
 
 /**
-* Keeps track of which libraries have been loaded. This function is
+* Keeps track of which libraries have been loaded.  This function is
 * called by the load_class() function above
 *
 * @access	public
@@ -428,7 +428,7 @@ if ( ! function_exists('set_status_header'))
 
 		if ($text == '')
 		{
-			show_error('No status text available. Please check your status code number or supply your own message text.', 500);
+			show_error('No status text available.  Please check your status code number or supply your own message text.', 500);
 		}
 
 		$server_protocol = (isset($_SERVER['SERVER_PROTOCOL'])) ? $_SERVER['SERVER_PROTOCOL'] : FALSE;
@@ -454,7 +454,7 @@ if ( ! function_exists('set_status_header'))
 * Exception Handler
 *
 * This is the custom exception handler that is declaired at the top
-* of Codeigniter.php. The main reason we use this is to permit
+* of Codeigniter.php.  The main reason we use this is to permit
 * PHP errors to be logged in our own log files since the user may
 * not have access to server logs. Since this function
 * effectively intercepts PHP errors, however, we also need
@@ -487,7 +487,7 @@ if ( ! function_exists('_exception_handler'))
 			$_error->show_php_error($severity, $message, $filepath, $line);
 		}
 
-		// Should we log the error? No? We're done...
+		// Should we log the error?  No?  We're done...
 		if (config_item('log_threshold') == 0)
 		{
 			return;
@@ -514,16 +514,16 @@ if ( ! function_exists('remove_invisible_characters'))
 	function remove_invisible_characters($str, $url_encoded = TRUE)
 	{
 		$non_displayables = array();
-
+		
 		// every control character except newline (dec 10)
 		// carriage return (dec 13), and horizontal tab (dec 09)
-
+		
 		if ($url_encoded)
 		{
 			$non_displayables[] = '/%0[0-8bcef]/';	// url encoded 00-08, 11, 12, 14, 15
 			$non_displayables[] = '/%1[0-9a-f]/';	// url encoded 16-31
 		}
-
+		
 		$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';	// 00-08, 11, 12, 14-31, 127
 
 		do