Doctrine

Timestamp:

02/13/08 04:13:55 (17 months ago)

Author:

guilhermeblanco

Message:

Merged r3561 into 0.10

Files:

• branches/0.10/lib/Doctrine/Node.php (modified) (1 diff)
• trunk/lib/Doctrine/Export.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Node.php

@@ -77 +77 @@
         if ($table->getOption('inheritanceMap')) {
             $subclasses = $table->getOption('subclasses');
-            while (in_array($class, $subclasses)) {
+            while (in_array($class, (array) $subclasses)) {
                 $class = get_parent_class($class);
             }

trunk/lib/Doctrine/Export.php

@@ -1077 +1077 @@
 
             if ( ! isset($connections[$connectionName])) {
-                $connections[$connectionName] = array();
-                $connections[$connectionName]['create_tables'] = array();
-                $connections[$connectionName]['create_sequences'] = array();
-                $connections[$connectionName]['alters'] = array();
+                $connections[$connectionName] = array(
+                    'create_tables' => array(),
+                    'create_sequences' => array(),
+                    'alters' => array()
+                );
             }