Skip to content

fix(ingo): remove deprecated V3 form shims in vacation/spam forms #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TDannhauer merged 2 commits into from
Jul 9, 2026
Merged

fix(ingo): remove deprecated V3 form shims in vacation/spam forms #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
354b149
fix(ingo): remove deprecated getInfo() $info argument in vacation form
TDannhauer Jul 9, 2026
1e34688
fix(ingo): remove deprecated ->type indirection in spam form
TDannhauer Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Basic/Spam.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ protected function _init()
$form->setCustomButtons($spam->disable);

/* Set default values. */
$form->folder_var->type->setFolder($spam->mailbox);
$form->folder_var->setFolder($spam->mailbox);
if (!$form->isSubmitted()) {
$this->vars->level = $spam->level;
$this->vars->folder = $spam->mailbox;
Expand Down
2 changes: 1 addition & 1 deletion lib/Form/Spam.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function validate($vars = null, $canAutoFill = false)
$vars = $this->_vars;
}
if (strlen($vars->get('folder_new'))) {
$this->folder_var->type->newFolderSet = true;
$this->folder_var->newFolderSet = true;
}
return parent::validate($vars, $canAutoFill);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Form/Vacation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ public function validate($vars = null, $canAutoFill = false)
}

if ($this->hasFeature('period')) {
$start = $this->_start->getInfo($vars, []);
$end = $this->_end->getInfo($vars, []);
$start = $this->_start->getInfo($vars);
$end = $this->_end->getInfo($vars);
if ($start && $end && $end < $start) {
$valid = false;
$this->_errors['end'] = _("Vacation end date is prior to start.");
Expand Down
Loading