Replace AND with &&

bcit-ci · Jan 20, 2012 · eab6023 · eab6023
1 parent d4addaf
commit eab6023
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
@@ -25,8 +25,6 @@
  * @filesource
  */
 
-// ------------------------------------------------------------------------
-
 /**
  * CodeIgniter Date Helpers
  *
@@ -441,11 +439,11 @@ function human_to_unix($datestr = '')
 		if (isset($split[2]))
 		{
 			$ampm = strtolower($split[2]);
-			if ($ampm[0] === 'p' AND $hour < 12)
+			if ($ampm[0] === 'p' && $hour < 12)
 			{
 				$hour += 12;
 			}
-			elseif ($ampm[0] === 'a' AND $hour == 12)
+			elseif ($ampm[0] === 'a' && $hour == 12)
 			{
 				$hour = 0;
 			}

diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
@@ -61,7 +61,7 @@ function force_download($filename = '', $data = '')
 		$extension = end(explode('.', $filename));
 
 		// Load the mime types
-		if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
+		if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 		{
 			include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
 		}