Merge pull request #2341 from dafriend/Validation_getErrors

lonnieezell · web-flow · commit 345caa30e505 · 2019-10-17T10:23:34.000-05:00
Simplify Validation::getErrors()
diff --git 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) && $errors = session('_ci_validation_errors'))
+			if (isset($_SESSION, $_SESSION['_ci_validation_errors']))
 			{
-				$this->errors = unserialize($errors);
+				$this->errors = unserialize($_SESSION['_ci_validation_errors']);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -646,9 +646,9 @@ public function getErrors(): array`
`646`	`646`	`// passed along from a redirect_with_input request.`
`647`	`647`	`if (empty($this->errors) && ! is_cli())`
`648`	`648`	`{`
`649`		`- if (isset($_SESSION) && $errors = session('_ci_validation_errors'))`
	`649`	`+ if (isset($_SESSION, $_SESSION['_ci_validation_errors']))`
`650`	`650`	`{`
`651`		`- $this->errors = unserialize($errors);`
	`651`	`+ $this->errors = unserialize($_SESSION['_ci_validation_errors']);`
`652`	`652`	`}`
`653`	`653`	`}`
`654`	`654`