Author: ornicar2
Date: 2010-02-11 20:16:59 +0100 (Thu, 11 Feb 2010)
New Revision: 27918
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmMedia.class.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/os/dmMimeTypeResolver.php
Log:
[Diem]
- mime type resolver now accepts a default value
- PluginDmMedia mime type defaults to 'application/force-download'
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmMedia.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmMedia.class.php
2010-02-11 19:00:10 UTC (rev 27917)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmMedia.class.php
2010-02-11 19:16:59 UTC (rev 27918)
@@ -288,7 +288,7 @@
if($mimeTypeResolver = $this->getService('mime_type_resolver'))
{
- $this->mime = $mimeTypeResolver->getByFilename($this->getFullPath());
+ $this->mime = $mimeTypeResolver->getByFilename($this->getFullPath(),
'application/force-download');
}
/*
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/os/dmMimeTypeResolver.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/os/dmMimeTypeResolver.php
2010-02-11 19:00:10 UTC (rev 27917)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/os/dmMimeTypeResolver.php
2010-02-11 19:16:59 UTC (rev 27918)
@@ -5,13 +5,9 @@
protected
$mimeTypes;
- public function getByFilename($file)
+ public function getByFilename($file, $default = null)
{
- $pathInfo = pathinfo($file);
-
- return isset($pathInfo['extension'])
- ? $this->getByExtension($pathInfo['extension'])
- : null;
+ return $this->getByExtension(pathinfo($file,PATHINFO_EXTENSION), $default);
}
public function getGroupByFilename($file)
@@ -19,8 +15,13 @@
return $this->getMimeTypeGroup($this->getByFilename($file));
}
- public function getByExtension($extension)
+ public function getByExtension($extension, $default = null)
{
+ if(!$extension)
+ {
+ return $default;
+ }
+
$extension = strtolower(trim($extension, '.'));
$mimeTypes = $this->getMimeTypes();
@@ -30,7 +31,7 @@
}
else
{
- $mimeType = null;
+ $mimeType = $default;
}
unset($mimeTypes);
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
