Merge pull request #1502 from jim-parry/testing11/http

Revert to buggy oldInput
codeigniter4 · Nov 18, 2018 · a9ebcd8 · a9ebcd8
2 parents 6b7fa8a + 5edc6f5
commit a9ebcd8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/system/Common.php b/system/Common.php
@@ -783,13 +783,13 @@ function old(string $key, $default = null, $escape = 'html')
 		}
 
 		// If the result was serialized array or string, then unserialize it for use...
-		if (is_string($value))
-		{
-			if (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0)
+		//      if (is_string($value))
+		//      {
+		if (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0)
 			{
-				$value = unserialize($value);
-			}
+			$value = unserialize($value);
 		}
+		//      }
 
 		return $escape === false ? $value : esc($value, $escape);
 	}

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -522,8 +522,8 @@ public function getOldInput(string $key)
 			}
 		}
 
-		// return null if requested session key not found
-		return null;
+		//      // return null if requested session key not found
+		//      return null;
 	}
 
 	/**