Merge branch 'old' into 22.x

aplus-framework · May 16, 2023 · 7bc4988 · 7bc4988
2 parents e31541a + a8ca706
commit 7bc4988
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/boot/helpers.php b/boot/helpers.php
@@ -156,7 +156,7 @@ function old(?string $key, bool $escape = true) : mixed
 {
     App::session()->activate();
     $data = App::request()->getRedirectData($key);
-    if ($escape) {
+    if ($data !== null && $escape) {
         $data = is_scalar($data) || (is_object($data) && method_exists($data, '__toString'))
             ? esc((string) $data)
             : '';

diff --git a/tests/boot/HelpersTest.php b/tests/boot/HelpersTest.php
@@ -100,6 +100,7 @@ public function testOld() : void
             'xss' => '<script>alert("xss")</script>',
         ]);
         App::session()->stop();
+        self::assertNull(old('unknown'));
         self::assertSame('', old('user'));
         self::assertSame('John Doe', old('user[name]'));
         self::assertSame(