apereo#36 fix CAS autoloader issue with conflicting autoloader

revskill10 · Apr 25, 2012 · 3a8967c · 3a8967c
1 parent 4200601
commit 3a8967c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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')) {
 
     /**