mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Monllao 2017-10-16 13:46:19 +02:00
commit 2350745d82
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
auth/cas/CAS/CAS/Autoload.php
View File

@ -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
auth/cas/CAS/moodle_readme.txt
View File

@ -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)