From 94026d914090861da9c2826508a4597badb86af6 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Wed, 15 Jul 2009 15:56:58 +0000
Subject: added return FALSE if directory_map() cannot read the directory

---
 system/helpers/directory_helper.php | 4 ++++
 user_guide/changelog.html           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php
index b1c497686..a6fb7841e 100644
--- a/system/helpers/directory_helper.php
+++ b/system/helpers/directory_helper.php
@@ -72,6 +72,10 @@ if ( ! function_exists('directory_map'))
 			closedir($fp);
 			return $filedata;
 		}
+		else
+		{
+			return FALSE;
+		}
 	}
 }
 
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 56081456f..2bbe832d1 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -82,7 +82,7 @@ SVN Revision: </p>
 		<ul>
 			<li>Added <kbd>form_multiselect()</kbd> to the <a href="helpers/form_helper.html">Form helper</a>.</li>
 			<li>Modified <kbd>form_hidden()</kbd> in the <a href="helpers/form_helper.html">Form helper</a> to accept multi-dimensional arrays.</li>
-			<li>Modified <kbd>directory_map()</kbd> in the <a href="helpers/directory_helper.html">Directory helper</a> to allow the inclusion of hidden files.</li>
+			<li>Modified <kbd>directory_map()</kbd> in the <a href="helpers/directory_helper.html">Directory helper</a> to allow the inclusion of hidden files, and to return FALSE on failure to read directory.</li>
 		</ul>
 	</li>
 	<li>General
-- 
cgit v1.2.3-24-g4f1b