Changeset 4360

Timestamp:

05/11/08 01:56:20 (8 months ago)

Author:

jwage

Message:

fixes #1024

Files:

• branches/0.11/lib/Doctrine/Lib.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Lib.php

@@ -250 +250 @@
             default:
                 $args = func_get_args();
-                $args[1] = sfToolkit::arrayDeepMerge($args[0], $args[1]);
+                $args[1] = self::arrayDeepMerge($args[0], $args[1]);
                 array_shift($args);