From 2308d28c197f194c5941c36ae5ffb6bd91b6f182 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 May 2016 19:23:56 +0200 Subject: [PATCH] FIX Add test code to detect/test autoload conflict --- .../restler/framework/Luracast/Restler/AutoLoader.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php index be9aa9c11df..bf3f24c9920 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php @@ -263,6 +263,12 @@ class AutoLoader * @return bool false unless className now exists */ private function loadLastResort($className, $loader = null) { + // DOL_LDR Add protection to avoid conflict with other autouploader + /*print 'Try to load '.$className."\n"; + if (in_array($className, array('Google_Client'))) + { + return false; + }*/ $loaders = array_unique(static::$rogueLoaders); if (isset($loader)) { if (false === array_search($loader, $loaders))