Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-04 16:07:49 +02:00
Code Issues Packages Projects Releases Activity

Fix undefined variable id on FormTrait::getFlash()

Browse Source
This commit is contained in:
Matias Griese
2019-01-15 20:18:46 +02:00
parent d7d69b2be8
commit 0ede252fa3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system/src/Grav/Framework/Form/Traits/FormTrait.php
View File

@@ -268,14 +268,15 @@ trait FormTrait
{
if (null === $this->flash) {
$grav = Grav::instance();
$user = $grav['user'];
$id = null;
$rememberState = $this->getBlueprint()->get('form/remember_state');
if ($rememberState === 'user') {
$user = $grav['user'];
$id = $user->username;
}
// By default store flash by the session id.
if (null === $id) {
/** @var Session $session */
$session = $grav['session'];
@@ -283,7 +284,7 @@ trait FormTrait
}
$this->flash = new FormFlash($id, $this->getUniqueId(), $this->getName());
$this->flash->setUrl($grav['uri']->url)->setUser($grav['user']);
$this->flash->setUrl($grav['uri']->url)->setUser($user);
}
return $this->flash;
@@ -448,6 +449,8 @@ trait FormTrait
foreach ($data as $key => &$value) {
if (\is_array($value)) {
$value = $this->jsonDecode($value);
} elseif ($value === '') {
unset($data[$key]);
} else {
$value = json_decode($value, true);
if ($value === null && json_last_error() !== JSON_ERROR_NONE) {