Commit d0e7a04f authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Stop the dwoo loader error (Bug #1193177)" into 1.9_STABLE

parents 6c123cea eaa54f90
...@@ -100,7 +100,9 @@ class Dwoo_Loader implements Dwoo_ILoader ...@@ -100,7 +100,9 @@ class Dwoo_Loader implements Dwoo_ILoader
public function loadPlugin($class, $forceRehash = true) public function loadPlugin($class, $forceRehash = true)
{ {
// a new class was added or the include failed so we rebuild the cache // a new class was added or the include failed so we rebuild the cache
if (!isset($this->classPath[$class]) || !(include $this->classPath[$class])) { if (!isset($this->classPath[$class]) ||
!is_readable($this->classPath[$class]) ||
!(include $this->classPath[$class])) {
if ($forceRehash) { if ($forceRehash) {
$this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d'.Dwoo::RELEASE_TAG.'.php'); $this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d'.Dwoo::RELEASE_TAG.'.php');
foreach ($this->paths as $path=>$file) { foreach ($this->paths as $path=>$file) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment