Skip to content

Commit 65ebfde

Browse files
Merge pull request #1729 from CachetHQ/fix-removal-customizations
Fixes removal of Customization values
2 parents 4f7c50f + de232ab commit 65ebfde

File tree

2 files changed

+28
-4
lines changed

2 files changed

+28
-4
lines changed

app/Config/Repository.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,20 @@ public function set($name, $value)
7070
}
7171
}
7272

73+
/**
74+
* Deletes a setting.
75+
*
76+
* @param string $name
77+
*
78+
* @return void
79+
*/
80+
public function delete($name)
81+
{
82+
$this->stale = true;
83+
84+
$this->model->where('name', $name)->delete();
85+
}
86+
7387
/**
7488
* Is the config state stale?
7589
*

app/Http/Controllers/Dashboard/SettingsController.php

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,22 @@ public function postSettings()
226226
$setting->set('app_banner', null);
227227
}
228228

229-
if ($header = Binput::get('header', null, false, false)) {
230-
$setting->set('header', $header);
229+
$parameters = Binput::all();
230+
231+
if (isset($parameters['header'])) {
232+
if ($header = Binput::get('header', null, false, false)) {
233+
$setting->set('header', $header);
234+
} else {
235+
$setting->delete('header');
236+
}
231237
}
232238

233-
if ($footer = Binput::get('footer', null, false, false)) {
234-
$setting->set('footer', $footer);
239+
if (isset($parameters['footer'])) {
240+
if ($footer = Binput::get('footer', null, false, false)) {
241+
$setting->set('footer', $footer);
242+
} else {
243+
$setting->delete('footer');
244+
}
235245
}
236246

237247
if (Binput::hasFile('app_banner')) {

0 commit comments

Comments
 (0)