Permalink
Browse files

Merge branch 'wip-MDL-60280-master' of git://github.com/marinaglancy/…

…moodle
  • Loading branch information...
dmonllao committed Oct 16, 2017
2 parents dde2ba7 + 06f86aa commit 2350745d82e2e2838d41584eb8e59d1d16d9051f
Showing with 11 additions and 25 deletions.
  1. +10 −25 auth/cas/CAS/CAS/Autoload.php
  2. +1 −0 auth/cas/CAS/moodle_readme.txt
@@ -74,32 +74,17 @@ function CAS_autoload($class)
}
// set up __autoload
if (function_exists('spl_autoload_register')) {
if (!(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')
&& !in_array('__autoload', spl_autoload_functions())
) {
spl_autoload_register('CAS_autoload');
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');
}
}
} elseif (!function_exists('__autoload')) {
/**
* Autoload a class
*
* @param string $class Class name
*
* @return bool
*/
function __autoload($class)
{
return CAS_autoload($class);
// __autoload() was being used, but now would be ignored, add
// it to the autoload stack
spl_autoload_register('__autoload');
}
}
?>
?>
@@ -1,3 +1,4 @@
Description of phpCAS 1.3.5 library import
* downloaded from http://downloads.jasig.org/cas-clients/php/current/
* applied patch https://github.com/apereo/phpCAS/pull/247 for PHP 7.2 compatibility (MDL-60280)

0 comments on commit 2350745

Please sign in to comment.