summaryrefslogtreecommitdiffstats
path: root/4178.patch
diff options
context:
space:
mode:
Diffstat (limited to '4178.patch')
-rw-r--r--4178.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/4178.patch b/4178.patch
new file mode 100644
index 0000000..c860520
--- /dev/null
+++ b/4178.patch
@@ -0,0 +1,24 @@
+From f4c6a0e0688cfb95afb695f0b26179df3e617e8d Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 14 Jun 2018 14:02:13 +0200
+Subject: [PATCH] cleanup RPM stuff (moved to downstream.php)
+
+---
+ inc/based_config.php | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/inc/based_config.php b/inc/based_config.php
+index da03ab70c0..834d4ea4ef 100644
+--- a/inc/based_config.php
++++ b/inc/based_config.php
+@@ -43,9 +43,7 @@
+ }
+
+ // If this file exists, it is load
+-if (!is_dir(GLPI_ROOT. '/config') && file_exists('/etc/glpi/local_define.php')) { // Relocated (Linux only)
+- require_once '/etc/glpi/local_define.php';
+-} else if (file_exists(GLPI_ROOT. '/config/local_define.php')) {
++if (file_exists(GLPI_ROOT. '/config/local_define.php')) {
+ require_once GLPI_ROOT. '/config/local_define.php';
+ }
+