Skip to content

Fix stale session data wrongly overriding configuration file when editing global configuration #20590

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 2 commits into from
Jun 12, 2018
Merged

Fix stale session data wrongly overriding configuration file when editing global configuration #20590

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eec5d7e
Fix stale session data wrongly overriding configuration file when edi…
ggppdk May 28, 2018
72ad71b
Use $this variable
ggppdk May 28, 2018
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
15 changes: 9 additions & 6 deletions administrator/components/com_config/controller/application/save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ public function execute()
// Validate the posted data.
$return = $model->validate($form, $data);

// Save the posted data in the session.
$this->app->setUserState('com_config.config.global.data', $data);

// Check for validation errors.
if ($return === false)
{
/*
* The validate method enqueued all messages for us, so we just need to redirect back.
*/

// Save the posted data in the session.
$this->app->setUserState('com_config.config.global.data', $data);

// Redirect back to the edit screen.
$this->app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.application', false));
}
Expand All @@ -89,23 +89,26 @@ public function execute()
$data = $return;
$return = $model->save($data);

// Save the validated data in the session.
$this->app->setUserState('com_config.config.global.data', $data);

// Check the return value.
if ($return === false)
{
/*
* The save method enqueued all messages for us, so we just need to redirect back.
*/

// Save the validated data in the session.
$this->app->setUserState('com_config.config.global.data', $data);

// Save failed, go back to the screen and display a notice.
$this->app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.application', false));
}

// Set the success message.
$this->app->enqueueMessage(JText::_('COM_CONFIG_SAVE_SUCCESS'), 'message');

// Clear the data from the session.
$this->app->setUserState('com_config.config.global.data', null);

// Set the redirect based on the task.
switch ($this->options[3])
{
Expand Down