From ef40640f53351cea789a9657050422917f0b581f Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 16 May 2008 04:14:36 +0000
Subject: fixed regular expression in Image lib, CI bug #4542

---
 system/libraries/Image_lib.php | 2 +-
 user_guide/changelog.html      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index a602b4645..430369786 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -226,7 +226,7 @@ class CI_Image_lib {
 				}
 				
 				// Is there a file name?
-				if ( ! preg_match("#[\.jpg|\.jpeg|\.gif|\.png]$#i", $full_dest_path))
+				if ( ! preg_match("#\.(jpg|jpeg|gif|png)$#i", $full_dest_path))
 				{
 					$this->dest_folder = $full_dest_path.'/';
 					$this->dest_image = $this->source_image;
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index e15cfc4f2..1199149a6 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -85,6 +85,7 @@ SVN Revision: not currently released</p>
 <ul>
 	<li>Amended fixes for bug (#3419) with parsing DSN database connections.</li>
 	<li>Fixed a syntax error in upload_lang.php</li>
+	<li>Fixed a bug (#4542) with a regular expression in the Image library</li>
 </ul>
 
 <h2>Version 1.6.2</h2>
-- 
cgit v1.2.3-24-g4f1b