Glob can return false on error, we should check before running a fore…

…ach.
pydio · Dec 2, 2015 · 85b7754 · 85b7754
1 parent 3975752
commit 85b7754
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/core/src/conf/bootstrap_context.php b/core/src/conf/bootstrap_context.php
@@ -144,8 +144,10 @@ function AjaXplorer_autoload($className)
 if(!is_file(AJXP_PLUGINS_BOOTSTRAP_CACHE)){
     $content = "<?php \n";
     $boots = glob(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/*/bootstrap.php");
-    foreach($boots as $b){
-        $content .= 'require_once("'.$b.'");'."\n";
+    if($boots !== false){
+        foreach($boots as $b){
+            $content .= 'require_once("'.$b.'");'."\n";
+        }
     }
     $resWriteBootstrapCache = @file_put_contents(AJXP_PLUGINS_BOOTSTRAP_CACHE, $content);
 }

diff --git a/core/src/conf/bootstrap_repositories.php b/core/src/conf/bootstrap_repositories.php
@@ -180,8 +180,10 @@
 if(!is_file(AJXP_PLUGINS_REPOSITORIES_CACHE)){
     $content = "<?php \n";
     $boots = glob(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/*/repositories.php");
-    foreach($boots as $b){
-        $content .= 'require_once("'.$b.'");'."\n";
+    if($boots !== false){
+        foreach($boots as $b){
+            $content .= 'require_once("'.$b.'");'."\n";
+        }
     }
     $resWriteRepoCache = @file_put_contents(AJXP_PLUGINS_REPOSITORIES_CACHE, $content);
 }