Doctrine

Timestamp:

01/30/08 00:51:53 (17 months ago)

Author:

guilhermeblanco

Message:

Merged changeset #3579 into 0.9 and 0.10 branches. This change does not break any test case, but it changes the behavior of Sluggable in both branches. TODO is to test this change in real life.

Location:

branches

Files:

• 0.10/lib/Doctrine/Template/Listener/Sluggable.php (modified) (2 diffs)
• 0.9/lib/Doctrine/Template/Listener/Sluggable.php (modified) (2 diffs)

branches/0.10/lib/Doctrine/Template/Listener/Sluggable.php

@@ -40 +40 @@
      * @var string
      */
-    protected $_options = array('name'    =>  'slug',
-                                'type'    =>  'clob',
-                                'length'  =>  null,
-                                'options' =>  array(),
-                                'fields'  =>  array());
+    protected $_options = array();
 
     /**
@@ -54 +50 @@
     public function __construct(array $options)
     {
-        $this->_options = Doctrine_Lib::arrayDeepMerge($this->_options, $options);
+        $this->_options = $options;
     }
 

branches/0.9/lib/Doctrine/Template/Listener/Sluggable.php

@@ -40 +40 @@
      * @var string
      */
-    protected $_options = array('name'    =>  'slug',
-                                'type'    =>  'clob',
-                                'length'  =>  null,
-                                'options' =>  array(),
-                                'fields'  =>  array());
+    protected $_options = array();
     
     /**
@@ -54 +50 @@
     public function __construct(array $options)
     {
-        $this->_options = array_merge($options, $this->_options);
+        $this->_options = $options;
     }