From ba9c9c02e4485b0fe899d0525f84e6bd9e32ddce Mon Sep 17 00:00:00 2001 From: michalsn Date: Sat, 28 Sep 2019 21:44:50 +0200 Subject: [PATCH 1/2] [ci skip] Validation errors with redirect fix --- system/Validation/Validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index 2ffaf5d41167..917a54e3e4c8 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -648,7 +648,7 @@ public function getErrors(): array { if (isset($_SESSION) && session('_ci_validation_errors')) { - $this->errors = unserialize($errors); + $this->errors = unserialize(session('_ci_validation_errors')); } } From 393e44ea26ffe21baa58a011d848e31f8dd5bdda Mon Sep 17 00:00:00 2001 From: michalsn Date: Sat, 28 Sep 2019 21:59:53 +0200 Subject: [PATCH 2/2] [ci skip] be smart --- system/Validation/Validation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index 917a54e3e4c8..3b9c7a27f79b 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -646,9 +646,9 @@ public function getErrors(): array // passed along from a redirect_with_input request. if (empty($this->errors) && ! is_cli()) { - if (isset($_SESSION) && session('_ci_validation_errors')) + if (isset($_SESSION) && $errors = session('_ci_validation_errors')) { - $this->errors = unserialize(session('_ci_validation_errors')); + $this->errors = unserialize($errors); } }