From 27197619c0d3baa95d9d208f13916a6205b6cfcf Mon Sep 17 00:00:00 2001 From: nao-pon Date: Mon, 30 Mar 2015 14:44:25 +0900 Subject: [PATCH] fix xoopscube#105 glob() result FALSE on except Linux --- html/core/XCube_Controller.class.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/html/core/XCube_Controller.class.php b/html/core/XCube_Controller.class.php index 3b338d0c3..ed1b52f3c 100644 --- a/html/core/XCube_Controller.class.php +++ b/html/core/XCube_Controller.class.php @@ -427,16 +427,16 @@ function _processPreload($path) { $path = $path . "/"; - if (is_dir($path)) { - foreach (glob($path.'/*.class.php') as $file) { - require_once $file; - $className = basename($file, '.class.php'); - if (XC_CLASS_EXISTS($className) && !isset($this->_mLoadedFilterNames[$className])) { - $this->_mLoadedFilterNames[$className] = true; - $instance = new $className($this); - $this->addActionFilter($instance); - unset($instance); - } + if (is_dir($path) && ($files = glob($path.'/*.class.php'))) { + foreach ($files as $file) { + require_once $file; + $className = basename($file, '.class.php'); + if (XC_CLASS_EXISTS($className) && !isset($this->_mLoadedFilterNames[$className])) { + $this->_mLoadedFilterNames[$className] = true; + $instance = new $className($this); + $this->addActionFilter($instance); + unset($instance); + } } } }