Skip to content

Improve option handling and fix format handling in the API #39498

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
merged 4 commits into from
Dec 28, 2022
Merged

Improve option handling and fix format handling in the API #39498

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83ac935
Improve option handling and fix format handling in the API
wilsonge Dec 26, 2022
f17dc33
Merge branch '4.2-dev' into fix/api-format-42
roland-d Dec 28, 2022
dc4f2cb
Merge branch '4.2-dev' into fix/api-format-42
wilsonge Dec 28, 2022
959b9ad
Merge branch '4.2-dev' into fix/api-format-42
roland-d Dec 28, 2022
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
23 changes: 16 additions & 7 deletions libraries/src/Application/ApiApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,17 +277,26 @@ protected function route()
throw $e;
}

$this->input->set('option', $route['vars']['component']);
$this->input->set('controller', $route['controller']);
$this->input->set('task', $route['task']);

foreach ($route['vars'] as $key => $value) {
if ($key !== 'component') {
if ($this->input->getMethod() === 'POST') {
$this->input->post->set($key, $value);
} else {
$this->input->set($key, $value);
}
// We inject the format directly above based on the negotiated format. We do not want the array of possible
// formats provided by the plugin!
if ($key === 'format') {
continue;
}

// We inject the component key into the option parameter in global input for b/c with the other applications
if ($key === 'component') {
$this->input->set('option', $route['vars'][$key]);
continue;
}

if ($this->input->getMethod() === 'POST') {
$this->input->post->set($key, $value);
} else {
$this->input->set($key, $value);
}
}

Expand Down