diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f2e15ca2..8f1902667 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ * **Build 27x** (2015-06-xx) - List columns now support specifying a `default` option used when the value would otherwise be null. - Implement a custom autoloader for plugins that use composer. Now only one instance of composer is used, all packages are now added to a global pool to prevent double loading and the load order is respected. + - The method signature of `Model::save()` has been fixed to match Eloquent. * **Build 272** (2015-06-27) - Protected images and their thumbnails are now supported in the back-end. diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php index 95d007540..5a0963960 100644 --- a/modules/backend/behaviors/RelationController.php +++ b/modules/backend/behaviors/RelationController.php @@ -915,7 +915,8 @@ class RelationController extends ControllerBehavior if ($this->viewMode == 'multi') { $model = $this->relationModel->find($this->manageId); - $model->save($saveData, $this->manageWidget->getSessionKey()); + $model->fill($saveData); + $model->save(null, $this->manageWidget->getSessionKey()); } elseif ($this->viewMode == 'single') { $this->viewWidget->setFormValues($saveData); diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php index 4e3742517..56d2c2952 100644 --- a/modules/system/behaviors/SettingsModel.php +++ b/modules/system/behaviors/SettingsModel.php @@ -125,7 +125,8 @@ class SettingsModel extends ModelBehavior { $data = is_array($key) ? $key : [$key => $value]; $obj = self::instance(); - return $obj->save($data); + $obj->fill($data); + return $obj->save(); } /** diff --git a/modules/system/classes/ComposerManager.php b/modules/system/classes/ComposerManager.php index 741eba2ea..8d14297f0 100644 --- a/modules/system/classes/ComposerManager.php +++ b/modules/system/classes/ComposerManager.php @@ -1,7 +1,5 @@