dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] Project : Autoload now handle weird syntax (eg. class Product{)

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7937 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2011-08-08 14:07:38 +00:00
parent 5155b92591
commit 953c9e0262
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Autoload.php
+3 -2
View File
@@ -59,8 +59,8 @@ class Autoload
$classes = array_merge($classes, $this->getClassesFromDir($path.$file.'/', $is_core));
else if (substr($file, -4) == '.php')
{
$content = file_get_contents($path.$file);
if (preg_match('#\W((abstract\s+)?class|interface)\s+(?P<classname>'.basename($file, '.php').'(Core)?)\s+((extends|implements)\s+[a-z][a-z0-9_]*)?\s*\{#i', $content, $m))
$content = file_get_contents($this->root_dir.$path.$file);
if (preg_match('#\W((abstract\s+)?class|interface)\s+(?P<classname>'.basename($file, '.php').'(Core)?)(\s+(extends|implements)\s+[a-z][a-z0-9_]*)?\s*\{#i', $content, $m))
{
$classes[$m['classname']] = $path.$file;
if (substr($m['classname'], -4) == 'Core')
@@ -110,6 +110,7 @@ class Autoload
if (isset($this->index[$classname.'Core']))
require_once($this->root_dir.$this->index[$classname.'Core']);
p($classname);
require_once($this->root_dir.$this->index[$classname]);
}
}