From 829b917bc0e6dd5b62093ab1ee202ff70ea7736a Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 23 Jan 2017 10:15:17 +0100 Subject: Update to 9.1.2, fix UT language Drop no longer needed patches --- glpi-9.1-pr1056.patch | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 glpi-9.1-pr1056.patch (limited to 'glpi-9.1-pr1056.patch') diff --git a/glpi-9.1-pr1056.patch b/glpi-9.1-pr1056.patch deleted file mode 100644 index 85593c6..0000000 --- a/glpi-9.1-pr1056.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e58360e8f377e95ef96711b8b4466b0a7c066a89 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 26 Sep 2016 08:45:22 +0200 -Subject: [PATCH] ensure GLPI autoloader always first in the stack - ---- - inc/autoload.function.php | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/inc/autoload.function.php b/inc/autoload.function.php -index 12fc186..3fce416 100644 ---- a/inc/autoload.function.php -+++ b/inc/autoload.function.php -@@ -336,12 +336,12 @@ function glpi_autoload($classname) { - } - } - --// Use spl autoload to allow stackable autoload. --spl_autoload_register('glpi_autoload'); -- - // composer autoload - $autoload = dirname(__DIR__) . '/vendor/autoload.php'; - if (!file_exists($autoload)) { - die('Run "composer install --no-dev" in the glpi tree'); - } - require_once $autoload; -+ -+// Use spl autoload to allow stackable autoload. -+spl_autoload_register('glpi_autoload', false, true); -\ No newline at end of file -- cgit