hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1156 : Move mime detection hack to application level

Browse Source
This commit is contained in:
Romain Neutron
2013-05-05 13:20:44 +02:00
parent bbfecfaa7c
commit 0470d9b57c
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
View File

@@ -18,8 +18,6 @@ use Silex\ControllerCollection;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser;
use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
use Symfony\Component\Serializer\Serializer; use Symfony\Component\Serializer\Serializer;
/** /**
@@ -150,12 +148,6 @@ class Upload implements ControllerProviderInterface
*/ */
public function upload(Application $app, Request $request) public function upload(Application $app, Request $request)
{ {
$guesser = MimeTypeGuesser::getInstance();
/**
* temporary hack to use this guesser before fileinfo
*/
$guesser->register(new FileBinaryMimeTypeGuesser());
$datas = array( $datas = array(
'success' => false, 'success' => false,
'code' => null, 'code' => null,

7
lib/Alchemy/Phrasea/Core.php
View File

@@ -14,6 +14,8 @@ namespace Alchemy\Phrasea;
use Alchemy\Phrasea\Core\Configuration; use Alchemy\Phrasea\Core\Configuration;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser;
use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
use Symfony\Component\Serializer; use Symfony\Component\Serializer;
use XPDF\PdfToText; use XPDF\PdfToText;
use XPDF\Exception\Exception as XPDFException; use XPDF\Exception\Exception as XPDFException;
@@ -148,6 +150,11 @@ class Core extends \Pimple
$this['mediavorus'] = $this->share(function() { $this['mediavorus'] = $this->share(function() {
$guesser = MimeTypeGuesser::getInstance();
/**
* temporary hack to use this guesser before fileinfo
*/
$guesser->register(new FileBinaryMimeTypeGuesser());
return new \MediaVorus\MediaVorus(); return new \MediaVorus\MediaVorus();
}); });