From 3aa6d22c2cdc9bd4e597614c58788291acc36843 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 1 Aug 2009 17:50:03 -0400 Subject: [PATCH] Correcting path that CakeSchema looks for schema files in. --- cake/libs/model/cake_schema.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php index 0718895ba..1a6f72587 100644 --- a/cake/libs/model/cake_schema.php +++ b/cake/libs/model/cake_schema.php @@ -90,7 +90,7 @@ class CakeSchema extends Object { } if (empty($options['path'])) { - $this->path = CONFIGS . 'sql'; + $this->path = CONFIGS . 'schema'; } $options = array_merge(get_object_vars($this), $options); @@ -161,6 +161,7 @@ class CakeSchema extends Object { extract(get_object_vars($this)); $class = $name .'Schema'; + if (!class_exists($class)) { if (file_exists($path . DS . $file) && is_file($path . DS . $file)) { require_once($path . DS . $file);