From 88dc41cc7f0ec7229b418a3d5df825efaaafa020 Mon Sep 17 00:00:00 2001 From: rMalie Date: Fri, 2 Dec 2011 14:34:48 +0000 Subject: [PATCH] // Fix autoload for classes with several implements --- classes/Autoload.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Autoload.php b/classes/Autoload.php index 9b7eb5b65..3db7fa93a 100644 --- a/classes/Autoload.php +++ b/classes/Autoload.php @@ -160,8 +160,8 @@ class Autoload else if (substr($file, -4) == '.php') { $content = file_get_contents($this->root_dir.$path.$file); - $pattern = '#\W((abstract\s+)?class|interface)\s+(?P'.basename($file, '.php') - .'(Core)?)(\s+(extends|implements)\s+[a-z][a-z0-9_]*)?\s*\{#i'; + $pattern = '#\W((abstract\s+)?class|interface)\s+(?P'.basename($file, '.php').'(Core)?)' + .'(\s+extends\s+[a-z][a-z0-9_]*)?(\s+implements\s+[a-z][a-z0-9_]*(\s*,\s*[a-z][a-z0-9_]*)*)?\s*\{#i'; if (preg_match($pattern, $content, $m)) { $classes[$m['classname']] = $path.$file;