summaryrefslogtreecommitdiffstats
path: root/5200.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-01-15 14:15:31 +0100
committerRemi Collet <remi@remirepo.net>2019-01-15 14:15:31 +0100
commitb7ba8bcddb63cc89bcbe348bd141033806cffcee (patch)
tree0460a671507baba3feee4b2512c94ab4a822f938 /5200.patch
parent4f9dcd0f8eec44bcda8e4cbb9b40f17aca483754 (diff)
v9.4.0RC2
Diffstat (limited to '5200.patch')
-rw-r--r--5200.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/5200.patch b/5200.patch
deleted file mode 100644
index 7ed7d76..0000000
--- a/5200.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 53de3f8e261cbc449deb5e603fe7d0f1c4c273ec Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 4 Jan 2019 16:08:52 +0100
-Subject: [PATCH] fix paths used for css/js test
-
----
- tests/units/Html.php | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/units/Html.php b/tests/units/Html.php
-index ee17710b31..c5d2f22068 100644
---- a/tests/units/Html.php
-+++ b/tests/units/Html.php
-@@ -421,7 +421,7 @@ public function testCss() {
- 'other.css',
- 'other-min.css'
- ];
-- $dir = str_replace(GLPI_ROOT, '', GLPI_TMP_DIR);
-+ $dir = str_replace(realpath(GLPI_ROOT), '', realpath(GLPI_TMP_DIR));
- $base_expected = '<link rel="stylesheet" type="text/css" href="'.
- $CFG_GLPI['root_doc'] . $dir .'/%url?v='. GLPI_VERSION .'" %attrs>';
- $base_attrs = 'media="all"';
-@@ -530,7 +530,7 @@ public function testScript() {
- 'other.js',
- 'other-min.js'
- ];
-- $dir = str_replace(GLPI_ROOT, '', GLPI_TMP_DIR);
-+ $dir = str_replace(realpath(GLPI_ROOT), '', realpath(GLPI_TMP_DIR));
- $base_expected = '<script type="text/javascript" src="'.
- $CFG_GLPI['root_doc'] . $dir .'/%url?v='. GLPI_VERSION .'"></script>';
-