Fix issue 966 dot array in old() function

Signed-off-by: Gabriel P <[email protected]>
codeigniter4 · Mar 20, 2018 · cd31a89 · cd31a89
1 parent 4457529
commit cd31a89
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -494,15 +494,23 @@ public function getOldInput(string $key)
 		helper('array');
 
 		// Check for an array value in POST.
-		if (isset($_SESSION['_ci_old_input']['post']) && dot_array_search($key, $_SESSION['_ci_old_input']['post']))
+		if (isset($_SESSION['_ci_old_input']['post']))
 		{
-			return dot_array_search($key, $_SESSION['_ci_old_input']['post']);
+			$value = dot_array_search($key, $_SESSION['_ci_old_input']['post']);
+			if ( ! is_null($value))
+			{
+				return $value;
+			}
 		}
 
 		// Check for an array value in GET.
-		if (isset($_SESSION['_ci_old_input']['get']) && dot_array_search($key, $_SESSION['_ci_old_input']['get']))
+		if (isset($_SESSION['_ci_old_input']['get']))
 		{
-			return dot_array_search($key, $_SESSION['_ci_old_input']['get']);
+			$value = dot_array_search($key, $_SESSION['_ci_old_input']['get']);
+			if ( ! is_null($value))
+			{
+				return $value;
+			}
 		}
 	}