Author: Jonathan.Wage
Date: 2010-02-02 22:12:10 +0100 (Tue, 02 Feb 2010)
New Revision: 27452
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/lib/model/types/sfSympalAssetObject.class.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing merge of asset options
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/lib/model/types/sfSympalAssetObject.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/lib/model/types/sfSympalAssetObject.class.php
2010-02-02 21:12:00 UTC (rev 27451)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/lib/model/types/sfSympalAssetObject.class.php
2010-02-02 21:12:10 UTC (rev 27452)
@@ -195,7 +195,7 @@
public function render($options = array())
{
- $options = array_merge(sfSympalConfig::get('assets',
'default_render_options', array()));
+ $options = array_merge(sfSympalConfig::get('assets',
'default_render_options', array()), $options);
$options =
sfApplicationConfiguration::getActive()->getEventDispatcher()->filter(new
sfEvent($this, 'sympal.assets.filter_render_options'),
$options)->getReturnValue();
if (isset($options['renderer']) && $options['renderer'])
{
--
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.
