diff --git a/core/trunk/core/docservers_tools.php b/core/trunk/core/docservers_tools.php index 4d99e7858e529ca90de54861b042caadd9cee818..66b06777639a62d268e08a0c04a89d8beca7fa7f 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 08007fce894a9c7897b60c474d5db1189db4bad1..497d2691fc68491a38e9fa956ce4c3715b9b28d3 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 d4c7b3aa532d37e9dc8f1712b43adecd8b0ab476..6a93cc744fdc65d853c86fb1178674dfd45e070a 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(