From 1322ec54289f09f7e176924902d5642f269aec48 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Wed, 11 Mar 2009 17:01:14 +0000
Subject: ereg eradication

---
 system/libraries/Image_lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'system/libraries/Image_lib.php')

diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 2896c9e07..1e1ae7db1 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -350,7 +350,7 @@ class CI_Image_lib {
 	{
 		$protocol = 'image_process_'.$this->image_library;
 
-		if (eregi("gd2$", $protocol))
+		if (preg_match('/gd2$/i', $protocol))
 		{
 			$protocol = 'image_process_gd';
 		}
@@ -373,7 +373,7 @@ class CI_Image_lib {
 	{
 		$protocol = 'image_process_'.$this->image_library;
 
-		if (eregi("gd2$", $protocol))
+		if (preg_match('/gd2$/i', $protocol))
 		{
 			$protocol = 'image_process_gd';
 		}
@@ -559,9 +559,9 @@ class CI_Image_lib {
 			return FALSE;
 		}
 
-		if ( ! eregi("convert$", $this->library_path))
+		if ( ! preg_match("/convert$/i", $this->library_path))
 		{
-			if ( ! eregi("/$", $this->library_path)) $this->library_path .= "/";
+			$this->library_path = rtrim($this->library_path, '/').'/';
 
 			$this->library_path .= 'convert';
 		}
-- 
cgit v1.2.3-24-g4f1b