From 5741aedbcf60639efb4c8c687e15898d258a4960 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Fri, 9 Sep 2016 10:17:46 +0000
Subject: [PATCH] FEAT #4542
---
core/trunk/core/docservers_tools.php | 5 +++--
core/trunk/install/class/Class_Install.php | 6 +++---
core/trunk/install/view/prerequisites_view.php | 18 ++++++++++--------
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/core/trunk/core/docservers_tools.php b/core/trunk/core/docservers_tools.php
index 4d99e7858e5..66b06777639 100644
--- a/core/trunk/core/docservers_tools.php
+++ b/core/trunk/core/docservers_tools.php
@@ -491,8 +491,9 @@ function Ds_setRights($dest)
*/
function Ds_getMimeType($filePath)
{
- require_once 'MIME/Type.php';
- return MIME_Type::autoDetect($filePath);
+ //require_once 'MIME/Type.php';
+ //return MIME_Type::autoDetect($filePath);
+ return mime_content_type($filePath);
}
/**
diff --git a/core/trunk/install/class/Class_Install.php b/core/trunk/install/class/Class_Install.php
index 08007fce894..497d2691fc6 100755
--- a/core/trunk/install/class/Class_Install.php
+++ b/core/trunk/install/class/Class_Install.php
@@ -132,9 +132,9 @@ class Install extends functions
if (!$this->isPearRequirements('System.php')) {
return false;
}
- if (!$this->isPearRequirements('MIME/Type.php')) {
- return false;
- }
+ // if (!$this->isPearRequirements('MIME/Type.php')) {
+ // return false;
+ // }
/*if (!$this->isIniErrorRepportingRequirements()) {
return false;
}*/
diff --git a/core/trunk/install/view/prerequisites_view.php b/core/trunk/install/view/prerequisites_view.php
index d4c7b3aa532..6a93cc744fd 100755
--- a/core/trunk/install/view/prerequisites_view.php
+++ b/core/trunk/install/view/prerequisites_view.php
@@ -238,18 +238,20 @@
<?php echo _PEAR;?>
</td>
</tr>
- <tr>
+ <!--tr>
<td class="voyantPrerequisites">
- <?php echo $Class_Install->checkPrerequisites(
- $Class_Install->isPearRequirements(
- 'MIME/Type.php'
- )
- );?>
+ <?php
+ // echo $Class_Install->checkPrerequisites(
+ // $Class_Install->isPearRequirements(
+ // 'MIME/Type.php'
+ // )
+ // );
+ ?>
</td>
<td>
- <?php echo _MIMETYPE;?>
+ <?php //echo _MIMETYPE;?>
</td>
- </tr>
+ </tr-->
<tr>
<td class="voyantPrerequisites">
<?php echo $Class_Install->checkPrerequisites(
--
GitLab