diff options
Diffstat (limited to 'h-source/Application/Controllers')
| -rw-r--r-- | h-source/Application/Controllers/UsersController.php | 3 | ||||
| -rw-r--r-- | h-source/Application/Controllers/WikiController.php | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/h-source/Application/Controllers/UsersController.php b/h-source/Application/Controllers/UsersController.php index 4fa078b..95addf4 100644 --- a/h-source/Application/Controllers/UsersController.php +++ b/h-source/Application/Controllers/UsersController.php @@ -76,7 +76,8 @@ class UsersController extends BaseController case 'accepted': if (strcmp($redirect,'') !== 0) { - $this->redirect($redirect,0); + $redirect = html_entity_decode($redirect,ENT_QUOTES,DEFAULT_CHARSET); + header('Location: http://'.DOMAIN_NAME."/".$redirect); } else { diff --git a/h-source/Application/Controllers/WikiController.php b/h-source/Application/Controllers/WikiController.php index a1b39ce..8f389e5 100644 --- a/h-source/Application/Controllers/WikiController.php +++ b/h-source/Application/Controllers/WikiController.php @@ -139,7 +139,7 @@ class WikiController extends BaseController } else { - $this->redirect("users/login/".$this->lang."?redirect=".$this->controller."/page/".$this->lang."/".encodeUrl($title),0); + header('Location: http://'.DOMAIN_NAME."/users/login/".$this->lang."?redirect=".$this->controller."/page/".$this->lang."/".titleForRedirect($title)); } } else @@ -198,7 +198,8 @@ class WikiController extends BaseController { $clean['idWiki'] = $rev->getIdPage($res_rev[0]['wiki_revisions']['id_rev']); $newTitle = $this->m['WikiModel']->getTheModelName($clean['idWiki']); - $this->redirect('wiki/page/'.$this->lang.'/'.encodeUrl($newTitle)); + $n = titleForRedirect($newTitle); + header('Location: http://'.DOMAIN_NAME.'/wiki/page/'.$this->lang.'/'.$n); } else { |