Merge pull request #557 from sime/2.1

array_merge breaks CakeSchema column type change Fixes #2672
cakephp · Mar 13, 2012 · 5033fb6 · 5033fb6
2 parents 68eeee8 + 791cc1a
commit 5033fb6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/Cake/Model/CakeSchema.php b/lib/Cake/Model/CakeSchema.php
@@ -484,7 +484,7 @@ public function compare($old, $new = null) {
 				if (!empty($old[$table][$field])) {
 					$diff = $this->_arrayDiffAssoc($value, $old[$table][$field]);
 					if (!empty($diff) && $field !== 'indexes' && $field !== 'tableParameters') {
-						$tables[$table]['change'][$field] = array_merge($old[$table][$field], $diff);
+						$tables[$table]['change'][$field] = $value;
 					}
 				}