fixed serendipity_traversePath(), thanks to jdhawk for the fix

diff --git a/docs/NEWS b/docs/NEWS
index c17e788233f37b788b6aa8d06273c5517301f29b..57dbca4f17bb40ce3d6f375e21146bbb29a8fb0a 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@ svn di# $Id$
 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 2eea3a3b6d07c1464376077ee2cf2425c7084577..7890a4db26b994238509232ac935e5836a72d341 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -1191,7 +1191,7 @@ function serendipity_traversePath($basedir, $dir='', $onlyDirs=true, $pattern =
 
     $dh = @opendir($basedir . '/' . $dir);
     if ( !$dh ) {
-        return false;
+        return array();
     }
 
     $files = array();