Author: ornicar2
Date: 2010-01-30 03:04:23 +0100 (Sat, 30 Jan 2010)
New Revision: 27317
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/dmHelper.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/media/dmMediaResource.php
Log:
[Diem]
- creating a media tag from an inexisting DmMedia no more throws an exception
but logs an error and renders an empty media
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/view/dmHelper.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/view/dmHelper.php 2010-01-30
01:29:50 UTC (rev 27316)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/view/dmHelper.php 2010-01-30
02:04:23 UTC (rev 27317)
@@ -223,10 +223,24 @@
public function £media($source)
{
- $this->serviceContainer->setParameter(
- 'media_tag.source',
- $resource =
$this->serviceContainer->getService('media_resource')->initialize($source)
- );
+ try
+ {
+ $this->serviceContainer->setParameter(
+ 'media_tag.source',
+ $resource =
$this->serviceContainer->getService('media_resource')->initialize($source)
+ );
+ }
+ catch(Exception $e)
+ {
+ $this->context->getLogger()->err($e->getMessage());
+
+ if (sfConfig::get('dm_debug'))
+ {
+ throw $e;
+ }
+
+ return $this->£media(null);
+ }
$serviceName = 'media_tag_'.$resource->getMime();
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/media/dmMediaResource.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/media/dmMediaResource.php
2010-01-30 01:29:50 UTC (rev 27316)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/media/dmMediaResource.php
2010-01-30 02:04:23 UTC (rev 27317)
@@ -66,6 +66,7 @@
{
$webPath =
$this->requestContext['relative_url_root'].$this->pathFromWebDir;
}
+
return $webPath;
}
--
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.
