diff --git a/inc/Action/Logout.php b/inc/Action/Logout.php index 159090423eb43e9816ddcd0888891642bf067a1d..80c63d687e20a09b69bfc7175bcb117e259ac50f 100644 --- a/inc/Action/Logout.php +++ b/inc/Action/Logout.php @@ -41,7 +41,7 @@ class Logout extends AbstractUserAction { // do the logout stuff and redirect to login auth_logoff(); - send_redirect(wl($ID, array('do' => 'login'))); + send_redirect(wl($ID, 'do=login', true, '&')); // should never be reached throw new ActionException('login'); diff --git a/inc/Action/Redirect.php b/inc/Action/Redirect.php index 2e28f45508a4822867d893dd112ff72a5b3b72a9..ed67d66d76479e2f507324e137be580c8be3ce17 100644 --- a/inc/Action/Redirect.php +++ b/inc/Action/Redirect.php @@ -55,7 +55,7 @@ class Redirect extends AbstractAliasAction { * @param array $opts id and fragment for the redirect and the preact */ public function redirect($opts) { - $go = wl($opts['id'], '', true); + $go = wl($opts['id'], '', true, '&'); if(isset($opts['fragment'])) $go .= '#' . $opts['fragment']; //show it diff --git a/inc/pageutils.php b/inc/pageutils.php index 55eda5514049cfd87044616d770bac2346a822b9..7e0e2d33e31de9cb6303b2ac37c76d458eb64d48 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -86,7 +86,7 @@ function getID($param='id',$clean=true){ if (isset($urlParameters['id'])) { unset($urlParameters['id']); } - send_redirect(wl($id,$urlParameters,true)); + send_redirect(wl($id, $urlParameters, true, '&')); } } diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 76ecae24ccc86201f256be36c4153e5747d1ef3a..08fc81da80c1740398c7b1125b0ee86165c32791 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -74,7 +74,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { // save state & force a page reload to get the new settings to take effect $_SESSION['PLUGIN_CONFIG'] = array('state' => 'updated', 'time' => time()); $this->_close_session(); - send_redirect(wl($ID,array('do'=>'admin','page'=>'config'),true,'&')); + send_redirect(wl($ID, 'do=admin&page=config'), true, '&')); exit(); } elseif(!$this->_error) { $this->_config->touch_settings(); // just touch to refresh cache