From: Tim Otten <totten@civicrm.org>
Date: Wed, 24 Jul 2013 17:41:23 +0000 (-0700)
Subject: CRM-13108 - Fix warning in CRM_Utils_File::findFiles (from rubofvil)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=002f17162e596746059b27085c0e2aca351dbb5a;p=civicrm-core.git

CRM-13108 - Fix warning in CRM_Utils_File::findFiles (from rubofvil)

Note: According to http://php.net/glob, the return result varies by
platform; sometimes it returns array(), and sometimes it returns FALSE.
The patch should work with either case.

----------------------------------------
* CRM-13108: Warnings when extensions is installed
  http://issues.civicrm.org/jira/browse/CRM-13108
---

diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
index 44350a47d0..5d068bf18d 100644
--- a/CRM/Utils/File.php
+++ b/CRM/Utils/File.php
@@ -529,9 +529,11 @@ HTACCESS;
     $result = array();
     while (!empty($todos)) {
       $subdir = array_shift($todos);
-      foreach (glob("$subdir/$pattern") as $match) {
-        if (!is_dir($match)) {
-          $result[] = $match;
+      if (is_array(glob("$subdir/$pattern"))) {
+        foreach (glob("$subdir/$pattern") as $match) {
+          if (!is_dir($match)) {
+            $result[] = $match;
+          }
         }
       }
       $dh = opendir($subdir);