From 5ad9e4ebba4ab8a8eb36952430d5a18978697360 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Fri, 20 Jan 2012 13:10:22 +0200
Subject: Replace AND with &&

---
 system/helpers/captcha_helper.php | 4 +---
 system/helpers/cookie_helper.php  | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'system')

diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php
index 0565457e2..3b62da929 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -25,8 +25,6 @@
  * @filesource
  */
 
-// ------------------------------------------------------------------------
-
 /**
  * CodeIgniter CAPTCHA Helper
  *
@@ -160,7 +158,7 @@ if ( ! function_exists('create_captcha'))
 		// -----------------------------------
 		//  Write the text
 		// -----------------------------------
-		$use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE;
+		$use_font = ($font_path != '' && file_exists($font_path) && function_exists('imagettftext'));
 
 		if ($use_font == FALSE)
 		{
diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php
index 52f489b39..f32a1a5ae 100644
--- a/system/helpers/cookie_helper.php
+++ b/system/helpers/cookie_helper.php
@@ -25,8 +25,6 @@
  * @filesource
  */
 
-// ------------------------------------------------------------------------
-
 /**
  * CodeIgniter Cookie Helpers
  *
-- 
cgit v1.2.3-24-g4f1b