Skip to content

Commit

Permalink
Merge pull request #1504 from jim-parry/testing11/http
Browse files Browse the repository at this point in the history
Revert RedirectResponse changes
  • Loading branch information
jim-parry authored Nov 18, 2018
2 parents a9ebcd8 + 5af4a08 commit 4594b8e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions system/Common.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -818,7 +818,7 @@ function redirect(string $uri = null)

if (! empty($uri))
{
return $response->route($uri);
return $response->to($uri);
}

return $response;
Expand Down
2 changes: 1 addition & 1 deletion system/HTTP/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ public function redirect(string $uri, string $method = 'auto', int $code = null)
}

$this->setStatusCode($code);

$this->sendHeaders();
return $this;
}

Expand Down

0 comments on commit 4594b8e

Please sign in to comment.