fixed serendipity_traversePath(), thanks to jdhawk for the fix

diff --git a/docs/NEWS b/docs/NEWS
index 4cd45f1bca42ceb10d6a2173aaa4fbd04129c7e4..5055e4220d7402332a6537bb119c675758b2b7c6 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 0.9 ()
 ------------------------------------------------------------------------
 
+    * fixed serendipity_traversePath() -  PHP5 issue with array_merge()
+      Thanks to jdhawk for the fix (flotsam)
+
     * fixed wrong display of "found X entries matching your search" in 
       genpage.inc.php (flotsam)
 
@@ -124,6 +127,9 @@ Version 0.9 ()
 Version 0.8.2 ()
 ------------------------------------------------------------------------
 
+    * fixed serendipity_traversePath() -  PHP5 issue with array_merge()
+      Thanks to jdhawk for the fix (flotsam)
+
     * CSS does no longer emit cache-restricting headers, so that the
       stylesheets can be cached by the browser for followup-requests
       Thanks to Sencer for pointing this out! (garvinhicking)

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index a1087149ef040413dd38e14b73ec0c6f0564500c..f3018a61ff0ebd3a097e67932e41202b7498c625 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -1195,7 +1195,7 @@ function serendipity_traversePath($basedir, $dir='', $onlyDirs=true, $pattern =
 
     $dh = @opendir($basedir . '/' . $dir);
     if ( !$dh ) {
-        return false;
+        return array();
     }
 
     $files = array();