summaryrefslogtreecommitdiffstats
path: root/glpi-9.1-pr1056.patch
diff options
context:
space:
mode:
authorJohan Cwiklinski <jcwiklinski@teclib.com>2017-01-23 10:15:17 +0100
committerRemi Collet <fedora@famillecollet.com>2017-01-23 10:34:10 +0100
commit829b917bc0e6dd5b62093ab1ee202ff70ea7736a (patch)
treefe128c33bef697811fcb1a4376fd48b1cccb07c7 /glpi-9.1-pr1056.patch
parentc2c94996a49a2c45b3010d892560ce237de7d578 (diff)
Update to 9.1.2, fix UT language
Drop no longer needed patches
Diffstat (limited to 'glpi-9.1-pr1056.patch')
-rw-r--r--glpi-9.1-pr1056.patch30
1 files changed, 0 insertions, 30 deletions
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 <fedora@famillecollet.com>
-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