Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2019-03-16 20:10:36 +01:00
commit 01cd40d5c6
2 changed files with 3 additions and 4 deletions

View File

@ -5,8 +5,7 @@
*/ */
spl_autoload_register(function ($class) { spl_autoload_register(function ($class) {
if (preg_match('/^DebugBar/', $class) || preg_match('/^'.preg_quote('Psr\Log', '/').'/', $class)) if (preg_match('/^DebugBar/', $class) || preg_match('/^'.preg_quote('Psr\Log', '/').'/', $class)) {
{
$file = DOL_DOCUMENT_ROOT.'/includes/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php'; $file = DOL_DOCUMENT_ROOT.'/includes/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
//var_dump($class.' - '.file_exists($file).' - '.$file); //var_dump($class.' - '.file_exists($file).' - '.$file);
if (file_exists($file)) { if (file_exists($file)) {