From cb2ea902c6564ba963463d7ceb2b97a6563422a8 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 2 Jan 2019 18:06:57 +0100
Subject: [PATCH] Fix infinite recursion
---
lib/_autoload_modules.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/_autoload_modules.php b/lib/_autoload_modules.php
index a8e04707b..8484e35b0 100644
--- a/lib/_autoload_modules.php
+++ b/lib/_autoload_modules.php
@@ -20,9 +20,11 @@
function temporaryLoader($class)
{
// handle the upgrade to the latest version of XMLSecLibs using namespaces
- if (strstr($class, 'XMLSec')) {
- if (class_exists('\\RobRichards\\XMLSecLibs\\'.$class, true)) {
- class_alias('\\RobRichards\\XMLSecLibs\\'.$class, $class);
+ if (strstr($class, 'XMLSec') && !strstr($class, '\\RobRichards\\XMLSecLibs\\')) {
+ $new = '\\RobRichards\\XMLSecLibs\\'.$class;
+ if (class_exists($new, false)) {
+ class_alias($new, $class);
+ SimpleSAML\Logger::warning("The class or interface '$original' is now using namespaces, please use '$new'.");
return;
}
}
--
GitLab