allow default options to be overridden properly
This commit is contained in:
parent
20b7487ea0
commit
206002de10
@ -58,7 +58,8 @@ class Doctrine_Template_Timestampable extends Doctrine_Template
|
|||||||
*/
|
*/
|
||||||
public function __construct(array $options)
|
public function __construct(array $options)
|
||||||
{
|
{
|
||||||
$this->_options = array_merge($options, $this->_options);
|
$this->_options['created'] = array_merge($this->_options['created'], $options['created']);
|
||||||
|
$this->_options['updated'] = array_merge($this->_options['updated'], $options['updated']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user