From 206002de1076e557f426ea43e69e72bf94e3385c Mon Sep 17 00:00:00 2001
From: gnat <gnat@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 27 Nov 2007 23:19:44 +0000
Subject: [PATCH] allow default options to be overridden properly

---
 lib/Doctrine/Template/Timestampable.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Doctrine/Template/Timestampable.php b/lib/Doctrine/Template/Timestampable.php
index 904dd1486..726746601 100644
--- a/lib/Doctrine/Template/Timestampable.php
+++ b/lib/Doctrine/Template/Timestampable.php
@@ -58,7 +58,8 @@ class Doctrine_Template_Timestampable extends Doctrine_Template
      */
     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']);
     }
     
     /**