From 3a8967c5ec3337751c031542f249435e7bac9e0c Mon Sep 17 00:00:00 2001 From: jfritschi Date: Wed, 25 Apr 2012 20:54:52 +0200 Subject: [PATCH] #36 fix CAS autoloader issue with conflicting autoloader --- source/CAS/Autoload.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/CAS/Autoload.php b/source/CAS/Autoload.php index 862fbbfd..d197fd4b 100644 --- a/source/CAS/Autoload.php +++ b/source/CAS/Autoload.php @@ -62,15 +62,14 @@ function CAS_autoload($class) // set up __autoload if (function_exists('spl_autoload_register')) { - if (!($_____t = spl_autoload_functions()) || !in_array('CAS_autoload', spl_autoload_functions())) { + if (!(spl_autoload_functions()) || !in_array('CAS_autoload', spl_autoload_functions())) { spl_autoload_register('CAS_autoload'); - if (function_exists('__autoload') && ($_____t === false)) { + if (function_exists('__autoload') && !in_array('__autoload', spl_autoload_functions())) { // __autoload() was being used, but now would be ignored, add // it to the autoload stack spl_autoload_register('__autoload'); } } - unset($_____t); } elseif (!function_exists('__autoload')) { /**