From 2798b5033815f9165ad10137c0866b5fdb59ea54 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Tue, 6 May 2008 14:12:18 +0000
Subject: fixed a bug where the dir resource was not closed in the directory
 helper, and made it more efficient

http://codeigniter.com/bug_tracker/bug/4206/
---
 system/helpers/directory_helper.php | 15 ++++++++++++---
 user_guide/changelog.html           |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php
index 5a23944cb..25c16c1fc 100644
--- a/system/helpers/directory_helper.php
+++ b/system/helpers/directory_helper.php
@@ -45,22 +45,31 @@ if (! function_exists('directory_map'))
 	{	
 		if ($fp = @opendir($source_dir))
 		{
+			$source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;		
 			$filedata = array();
+			
 			while (FALSE !== ($file = readdir($fp)))
 			{
-				if (@is_dir($source_dir.$file) && substr($file, 0, 1) != '.' AND $top_level_only == FALSE)
+				if (substr($file, 0, 1) == '.')
+				{
+					continue;
+				}
+				
+				if ($top_level_only == FALSE && @is_dir($source_dir.$file))
 				{
 					$temp_array = array();
 				
-					$temp_array = directory_map($source_dir.$file."/");
+					$temp_array = directory_map($source_dir.$file.DIRECTORY_SEPARATOR);
 				
 					$filedata[$file] = $temp_array;
 				}
-				elseif (substr($file, 0, 1) != ".")
+				else
 				{
 					$filedata[] = $file;
 				}
 			}
+			
+			closedir($fp);
 			return $filedata;
 		}
 	}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index fec2d12c3..2242f86e9 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -120,6 +120,7 @@ SVN Commit: not currently released</p>
 	<li>Fixed a bug in <kbd>link_tag()</kbd> of the <a href="helpers/url_helper.html">URL helper</a> where a key was passed instead of a value.</li>
 	<li>Fixed a bug in DB_result::row() that prevented it from returning individual fields with MySQL NULL values.</li>
 	<li>Fixed a bug in the table library that could cause identically constructed rows to be dropped (#3459).</li>
+	<li>Fixed a bug (#4206) in the Directory Helper where the directory resource was not being closed, and minor improvements.</li>
 </ul>
 
 <h2>Version 1.6.1</h2>
-- 
cgit v1.2.3-24-g4f1b