Skip to content

Commit

Permalink
Merge pull request zendframework#741 from EvanDotPro/hotfix/module-lo…
Browse files Browse the repository at this point in the history
…ader-glob-array

Make sure glob attempt always returns an array.
  • Loading branch information
Bittarman committed Jan 24, 2012
2 parents baaa30d + 9acc50b commit f2b4ac8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion library/Zend/Loader/ModuleAutoloader.php
Expand Up @@ -106,7 +106,7 @@ public function autoload($class)
//$moduleName = substr($class, 0, strpos($class, '\\'));

// Find executable phars
$matches = glob($path . '.{' . implode($this->pharExtensions, ',') . '}', GLOB_BRACE);
$matches = glob($path . '.{' . implode($this->pharExtensions, ',') . '}', GLOB_BRACE) ?: array();
foreach ($matches as $phar) {
if ($classLoaded = $this->loadModuleFromPhar($phar, $class)) {
return $classLoaded;
Expand Down

0 comments on commit f2b4ac8

Please sign in to comment.