From ce315d1edf51201fd868e47ce2557badeeab40a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Tue, 22 Jun 2021 10:33:08 +0200
Subject: [PATCH] :ambulance: fix(core) Remove double underscore from autoload
function name
This fixes a warning from PHPCompatiblity about a possible future
conflict with PHP internal functions.
issue #6167
---
include/functions.inc | 4 ++--
include/login/class_LoginCAS.inc | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/functions.inc b/include/functions.inc
index e75dfa313..71842772f 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -41,7 +41,7 @@ require_once('accept-to-gettext.inc');
* \param array $class_name list of class name
*/
-function __fusiondirectory_autoload ($class_name)
+function fusiondirectory_autoload ($class_name)
{
global $class_mapping, $BASE_DIR, $config;
@@ -79,7 +79,7 @@ function __fusiondirectory_autoload ($class_name)
exit;
}
}
-spl_autoload_register('__fusiondirectory_autoload');
+spl_autoload_register('fusiondirectory_autoload');
/*!
diff --git a/include/login/class_LoginCAS.inc b/include/login/class_LoginCAS.inc
index bff298ce2..46fe285a4 100644
--- a/include/login/class_LoginCAS.inc
+++ b/include/login/class_LoginCAS.inc
@@ -36,8 +36,8 @@ class LoginCAS extends LoginMethod
require_once('CAS.php');
/* Move FD autoload after CAS autoload */
- spl_autoload_unregister('__fusiondirectory_autoload');
- spl_autoload_register('__fusiondirectory_autoload');
+ spl_autoload_unregister('fusiondirectory_autoload');
+ spl_autoload_register('fusiondirectory_autoload');
if ($config->get_cfg_value('casVerbose') == 'TRUE') {
phpCAS::setVerbose(TRUE);
--
GitLab