tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Ticket #49: Factfinder: "Finish" doesn't redirect to "thank you"

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46044 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Normann Lou 2007-11-30 01:24:02 +00:00
parent f9dc7a81d7
commit 2ccd4c06ee
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/control/Controller.php
View File

@ -422,6 +422,10 @@ class Controller extends ViewableData {
* Handle redirection * Handle redirection
*/ */
function redirect($url) { function redirect($url) {
if($this->response->getHeader('Location')) {
user_error("Already directed to " . $this->response->getHeader('Location') . "; now trying to direct to $url", E_USER_ERROR);
}
// Attach site-root to relative links, if they have a slash in them // Attach site-root to relative links, if they have a slash in them
if($url == "" || $url[0] == '?' || (substr($url,0,4) != "http" && $url[0] != "/" && strpos($url,'/') !== false)){ if($url == "" || $url[0] == '?' || (substr($url,0,4) != "http" && $url[0] != "/" && strpos($url,'/') !== false)){
$url = Director::baseURL() . $url; $url = Director::baseURL() . $url;

2
core/control/Director.php
View File

@ -240,7 +240,7 @@ class Director {
* @return string If redirect() has been called, it will return the URL redirected to. Otherwise, it will return null; * @return string If redirect() has been called, it will return the URL redirected to. Otherwise, it will return null;
*/ */
static function redirected_to() { static function redirected_to() {
Controller::curr()->redirectedTo(); return Controller::curr()->redirectedTo();
} }
/* /*