From b7ba8bcddb63cc89bcbe348bd141033806cffcee Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 14:15:31 +0100 Subject: v9.4.0RC2 --- 5200.patch | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 5200.patch (limited to '5200.patch') 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 -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 = ''; - $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 = ''; - -- cgit